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

index 3e92820bc82007111ff4a87f9da5fb528be183de..390c5b3ad4f6717ee3bb29bff44b6441c49c3921 100644 (file)
@@ -228,9 +228,9 @@ static const struct iio_chan_spec bh1750_channels[] = {
        }
 };
 
-static int bh1750_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int bh1750_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        int ret, usec;
        struct bh1750_data *data;
        struct iio_dev *indio_dev;
@@ -320,7 +320,7 @@ static struct i2c_driver bh1750_driver = {
                .of_match_table = bh1750_of_match,
                .pm = pm_sleep_ptr(&bh1750_pm_ops),
        },
-       .probe = bh1750_probe,
+       .probe_new = bh1750_probe,
        .remove = bh1750_remove,
        .id_table = bh1750_id,