[PATCH v2] iio: chemical: atlas-ezo-sensor: Simplify probe()

[PATCH v2] iio: chemical: atlas-ezo-sensor: Simplify probe()

[Biju Das]

Simplify the probe() by replacing device_get_match_data() and ID lookup
match 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v1->v2:
 * Dropped the sentence for removing id from commit description.
 * Added Rb tag from Andy.
---
 drivers/iio/chemical/atlas-ezo-sensor.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/iio/chemical/atlas-ezo-sensor.c b/drivers/iio/chemical/atlas-ezo-sensor.c
index 8fc926a2d33b..761a853a4d17 100644
--- a/drivers/iio/chemical/atlas-ezo-sensor.c
+++ b/drivers/iio/chemical/atlas-ezo-sensor.c
@@ -203,7 +203,6 @@ MODULE_DEVICE_TABLE(of, atlas_ezo_dt_ids);
 
 static int atlas_ezo_probe(struct i2c_client *client)
 {
-	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	const struct atlas_ezo_device *chip;
 	struct atlas_ezo_data *data;
 	struct iio_dev *indio_dev;
@@ -212,10 +211,7 @@ static int atlas_ezo_probe(struct i2c_client *client)
 	if (!indio_dev)
 		return -ENOMEM;
 
-	if (dev_fwnode(&client->dev))
-		chip = device_get_match_data(&client->dev);
-	else
-		chip = (const struct atlas_ezo_device *)id->driver_data;
+	chip = i2c_get_match_data(client);
 	if (!chip)
 		return -EINVAL;
 
-- 
2.25.1

Re: [PATCH v2] iio: chemical: atlas-ezo-sensor: Simplify probe()

[Jonathan Cameron]

On Fri, 18 Aug 2023 19:31:28 +0100
Biju Das <biju.das.jz@bp.renesas.com> wrote:

> Simplify the probe() by replacing device_get_match_data() and ID lookup
> match 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied.

Thanks,

J
> ---
> v1->v2:
>  * Dropped the sentence for removing id from commit description.
>  * Added Rb tag from Andy.
> ---
>  drivers/iio/chemical/atlas-ezo-sensor.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/iio/chemical/atlas-ezo-sensor.c b/drivers/iio/chemical/atlas-ezo-sensor.c
> index 8fc926a2d33b..761a853a4d17 100644
> --- a/drivers/iio/chemical/atlas-ezo-sensor.c
> +++ b/drivers/iio/chemical/atlas-ezo-sensor.c
> @@ -203,7 +203,6 @@ MODULE_DEVICE_TABLE(of, atlas_ezo_dt_ids);
>  
>  static int atlas_ezo_probe(struct i2c_client *client)
>  {
> -	const struct i2c_device_id *id = i2c_client_get_device_id(client);
>  	const struct atlas_ezo_device *chip;
>  	struct atlas_ezo_data *data;
>  	struct iio_dev *indio_dev;
> @@ -212,10 +211,7 @@ static int atlas_ezo_probe(struct i2c_client *client)
>  	if (!indio_dev)
>  		return -ENOMEM;
>  
> -	if (dev_fwnode(&client->dev))
> -		chip = device_get_match_data(&client->dev);
> -	else
> -		chip = (const struct atlas_ezo_device *)id->driver_data;
> +	chip = i2c_get_match_data(client);
>  	if (!chip)
>  		return -EINVAL;
>