]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
iio: pressure: mpl115_i2c: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:38:26 +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-173-uwe@kleine-koenig.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/pressure/mpl115_i2c.c

index 555bda1146fb95b11ea38114237939e80d793b55..ade4dd854ddf1b57f3ef1aa30086d0d1efeb8313 100644 (file)
@@ -35,9 +35,9 @@ static const struct mpl115_ops mpl115_i2c_ops = {
        .write = mpl115_i2c_write,
 };
 
-static int mpl115_i2c_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int mpl115_i2c_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))
                return -EOPNOTSUPP;
 
@@ -55,7 +55,7 @@ static struct i2c_driver mpl115_i2c_driver = {
                .name   = "mpl115",
                .pm = pm_ptr(&mpl115_dev_pm_ops),
        },
-       .probe = mpl115_i2c_probe,
+       .probe_new = mpl115_i2c_probe,
        .id_table = mpl115_i2c_id,
 };
 module_i2c_driver(mpl115_i2c_driver);