iio: pressure: mpl3115: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:38:27 +0000 (23:38 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 23 Nov 2022 20:20:31 +0000 (20:20 +0000)
.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20221118224540.619276-174-uwe@kleine-koenig.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/pressure/mpl3115.c

index 2f22aba61e4dd39a9afcd1c768fdfb53f7ce02e2..72e811a5c96e607bf63e26eb5b755263d916cf26 100644 (file)
@@ -230,9 +230,9 @@ static const struct iio_info mpl3115_info = {
        .read_raw = &mpl3115_read_raw,
 };
 
-static int mpl3115_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int mpl3115_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct mpl3115_data *data;
        struct iio_dev *indio_dev;
        int ret;
@@ -335,7 +335,7 @@ static struct i2c_driver mpl3115_driver = {
                .of_match_table = mpl3115_of_match,
                .pm     = pm_sleep_ptr(&mpl3115_pm_ops),
        },
-       .probe = mpl3115_probe,
+       .probe_new = mpl3115_probe,
        .remove = mpl3115_remove,
        .id_table = mpl3115_id,
 };