| Message ID | 20230902170529.62297-1-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: adc: ltc2497: Simplify probe() | expand |
On Sat, 2 Sep 2023 18:05:29 +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 to the togreg branch of iio.git and pushed out testing. Thanks, Jonathan > --- > drivers/iio/adc/ltc2497.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/iio/adc/ltc2497.c b/drivers/iio/adc/ltc2497.c > index 5bdd40729611..6401a7727c31 100644 > --- a/drivers/iio/adc/ltc2497.c > +++ b/drivers/iio/adc/ltc2497.c > @@ -95,7 +95,6 @@ static int ltc2497_result_and_measure(struct ltc2497core_driverdata *ddata, > > static int ltc2497_probe(struct i2c_client *client) > { > - const struct i2c_device_id *id = i2c_client_get_device_id(client); > const struct ltc2497_chip_info *chip_info; > struct iio_dev *indio_dev; > struct ltc2497_driverdata *st; > @@ -115,9 +114,7 @@ static int ltc2497_probe(struct i2c_client *client) > st->client = client; > st->common_ddata.result_and_measure = ltc2497_result_and_measure; > > - chip_info = device_get_match_data(dev); > - if (!chip_info) > - chip_info = (const struct ltc2497_chip_info *)id->driver_data; > + chip_info = i2c_get_match_data(client); > st->common_ddata.chip_info = chip_info; > > resolution = chip_info->resolution;
diff --git a/drivers/iio/adc/ltc2497.c b/drivers/iio/adc/ltc2497.c index 5bdd40729611..6401a7727c31 100644 --- a/drivers/iio/adc/ltc2497.c +++ b/drivers/iio/adc/ltc2497.c @@ -95,7 +95,6 @@ static int ltc2497_result_and_measure(struct ltc2497core_driverdata *ddata, static int ltc2497_probe(struct i2c_client *client) { - const struct i2c_device_id *id = i2c_client_get_device_id(client); const struct ltc2497_chip_info *chip_info; struct iio_dev *indio_dev; struct ltc2497_driverdata *st; @@ -115,9 +114,7 @@ static int ltc2497_probe(struct i2c_client *client) st->client = client; st->common_ddata.result_and_measure = ltc2497_result_and_measure; - chip_info = device_get_match_data(dev); - if (!chip_info) - chip_info = (const struct ltc2497_chip_info *)id->driver_data; + chip_info = i2c_get_match_data(client); st->common_ddata.chip_info = chip_info; resolution = chip_info->resolution;
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/ltc2497.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)