iio: accel: adxl355: Simplify probe()
authorBiju Das <biju.das.jz@bp.renesas.com>
Sun, 16 Jul 2023 17:52:15 +0000 (18:52 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 22 Jul 2023 16:24:51 +0000 (17:24 +0100)
Simplify the probe() by replacing of_device_get_match_data() and
i2c_match_id() by i2c_get_match_data() as we have similar I2C
and DT-based matching table.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Puranjay Mohan <puranjay12@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20230716175218.130557-2-biju.das.jz@bp.renesas.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/accel/adxl355_i2c.c

index d5beea6..32398cd 100644 (file)
@@ -24,19 +24,10 @@ static int adxl355_i2c_probe(struct i2c_client *client)
 {
        struct regmap *regmap;
        const struct adxl355_chip_info *chip_data;
-       const struct i2c_device_id *adxl355;
 
-       chip_data = device_get_match_data(&client->dev);
-       if (!chip_data) {
-               adxl355 = to_i2c_driver(client->dev.driver)->id_table;
-               if (!adxl355)
-                       return -EINVAL;
-
-               chip_data = (void *)i2c_match_id(adxl355, client)->driver_data;
-
-               if (!chip_data)
-                       return -EINVAL;
-       }
+       chip_data = i2c_get_match_data(client);
+       if (!chip_data)
+               return -ENODEV;
 
        regmap = devm_regmap_init_i2c(client, &adxl355_i2c_regmap_config);
        if (IS_ERR(regmap)) {