| Message ID | 20230902163233.56449-1-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: adc: ti-ads1015: Simplify probe() | expand |
On Sat, 2 Sep 2023 17:32:33 +0100 Biju Das <biju.das.jz@bp.renesas.com> wrote: > Simpilfy probe() by replacing device_get_match_data() and id lookup for > retrieving match data by using i2c_get_match_data(). > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Applied. > --- > drivers/iio/adc/ti-ads1015.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c > index 075c75a87544..9984515bfdea 100644 > --- a/drivers/iio/adc/ti-ads1015.c > +++ b/drivers/iio/adc/ti-ads1015.c > @@ -976,16 +976,13 @@ static int ads1015_set_conv_mode(struct ads1015_data *data, int mode) > > static int ads1015_probe(struct i2c_client *client) > { > - const struct i2c_device_id *id = i2c_client_get_device_id(client); > const struct ads1015_chip_data *chip; > struct iio_dev *indio_dev; > struct ads1015_data *data; > int ret; > int i; > > - chip = device_get_match_data(&client->dev); > - if (!chip) > - chip = (const struct ads1015_chip_data *)id->driver_data; > + chip = i2c_get_match_data(client); > if (!chip) > return dev_err_probe(&client->dev, -EINVAL, "Unknown chip\n"); >
diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c index 075c75a87544..9984515bfdea 100644 --- a/drivers/iio/adc/ti-ads1015.c +++ b/drivers/iio/adc/ti-ads1015.c @@ -976,16 +976,13 @@ static int ads1015_set_conv_mode(struct ads1015_data *data, int mode) static int ads1015_probe(struct i2c_client *client) { - const struct i2c_device_id *id = i2c_client_get_device_id(client); const struct ads1015_chip_data *chip; struct iio_dev *indio_dev; struct ads1015_data *data; int ret; int i; - chip = device_get_match_data(&client->dev); - if (!chip) - chip = (const struct ads1015_chip_data *)id->driver_data; + chip = i2c_get_match_data(client); if (!chip) return dev_err_probe(&client->dev, -EINVAL, "Unknown chip\n");
Simpilfy probe() by replacing device_get_match_data() and id lookup for retrieving match data by using i2c_get_match_data(). Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/iio/adc/ti-ads1015.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)