iio: accel: mma9551: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:36:31 +0000 (23:36 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 23 Nov 2022 20:01:39 +0000 (20:01 +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-58-uwe@kleine-koenig.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/accel/mma9551.c

index f7a793f4a8e342dcdf111fa62746eee611df583e..aa4f5842859ef863ea5769966b76642a76ef1402 100644 (file)
@@ -446,9 +446,9 @@ static const char *mma9551_match_acpi_device(struct device *dev)
        return dev_name(dev);
 }
 
-static int mma9551_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int mma9551_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct mma9551_data *data;
        struct iio_dev *indio_dev;
        const char *name = NULL;
@@ -607,7 +607,7 @@ static struct i2c_driver mma9551_driver = {
                   .acpi_match_table = ACPI_PTR(mma9551_acpi_match),
                   .pm = pm_ptr(&mma9551_pm_ops),
                   },
-       .probe = mma9551_probe,
+       .probe_new = mma9551_probe,
        .remove = mma9551_remove,
        .id_table = mma9551_id,
 };