OSDN Git Service

iio: pressure: bmp280: convert to i2c's .probe_new()
authorAngel Iglesias <ang.iglesiasg@gmail.com>
Sun, 13 Nov 2022 17:54:46 +0000 (18:54 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 23 Nov 2022 20:01:38 +0000 (20:01 +0000)
Use i2c_client_get_device_id() to get the i2c_device_id* parameter in the
.new_probe() callback.

Signed-off-by: Angel Iglesias <ang.iglesiasg@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/5dcaa389ea2ffe7050091b07a3bc4b0c1c9d586b.1668361368.git.ang.iglesiasg@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/pressure/bmp280-i2c.c

index 0c27211..14eab08 100644 (file)
@@ -5,11 +5,11 @@
 
 #include "bmp280.h"
 
-static int bmp280_i2c_probe(struct i2c_client *client,
-                           const struct i2c_device_id *id)
+static int bmp280_i2c_probe(struct i2c_client *client)
 {
        struct regmap *regmap;
        const struct regmap_config *regmap_config;
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
 
        switch (id->driver_data) {
        case BMP180_CHIP_ID:
@@ -65,7 +65,7 @@ static struct i2c_driver bmp280_i2c_driver = {
                .of_match_table = bmp280_of_i2c_match,
                .pm = pm_ptr(&bmp280_dev_pm_ops),
        },
-       .probe          = bmp280_i2c_probe,
+       .probe_new      = bmp280_i2c_probe,
        .id_table       = bmp280_i2c_id,
 };
 module_i2c_driver(bmp280_i2c_driver);