diff options
| author | Biju Das <biju.das.jz@bp.renesas.com> | 2023-07-16 18:52:15 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-07-22 17:24:51 +0100 |
| commit | ad25fc289be9532f486ef2cc6156e8d5acb060db (patch) | |
| tree | 3eb71e8afea8c163d04acbd0ce00ea9924ea0791 /drivers/iio | |
| parent | 3a06b2845a09a2c7bcbd909d4289353f054363e9 (diff) | |
| download | linux-stable-ad25fc289be9532f486ef2cc6156e8d5acb060db.tar.gz linux-stable-ad25fc289be9532f486ef2cc6156e8d5acb060db.tar.bz2 linux-stable-ad25fc289be9532f486ef2cc6156e8d5acb060db.zip | |
iio: accel: adxl355: Simplify probe()
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>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/accel/adxl355_i2c.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/iio/accel/adxl355_i2c.c b/drivers/iio/accel/adxl355_i2c.c index d5beea61479d..32398cde9608 100644 --- a/drivers/iio/accel/adxl355_i2c.c +++ b/drivers/iio/accel/adxl355_i2c.c @@ -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)) { |