[PATCH v2] iio: pressure: ms5637: Use i2c_get_match_data()

[PATCH v2] iio: pressure: ms5637: Use i2c_get_match_data()

[Biju Das]

Replace device_get_match_data() and id lookup for retrieving match data
by i2c_get_match_data().

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v1->v2:
 * Added Rb tag from Andy
 * Drooped id variable removal from commit description.
---
 drivers/iio/pressure/ms5637.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/iio/pressure/ms5637.c b/drivers/iio/pressure/ms5637.c
index 9b3abffb724b..ac30d76285d1 100644
--- a/drivers/iio/pressure/ms5637.c
+++ b/drivers/iio/pressure/ms5637.c
@@ -144,7 +144,6 @@ static const struct iio_info ms5637_info = {
 
 static int ms5637_probe(struct i2c_client *client)
 {
-	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	const struct ms_tp_data *data;
 	struct ms_tp_dev *dev_data;
 	struct iio_dev *indio_dev;
@@ -159,10 +158,7 @@ static int ms5637_probe(struct i2c_client *client)
 		return -EOPNOTSUPP;
 	}
 
-	if (id)
-		data = (const struct ms_tp_data *)id->driver_data;
-	else
-		data = device_get_match_data(&client->dev);
+	data = i2c_get_match_data(client);
 	if (!data)
 		return -EINVAL;
 
-- 
2.25.1

Re: [PATCH v2] iio: pressure: ms5637: Use i2c_get_match_data()

[Jonathan Cameron]

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

> Replace device_get_match_data() and id lookup for retrieving match data
> by i2c_get_match_data().
> 
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Seems a little odd that the 5803 is only in the of_device_id table, but
this patch doesn't (and shouldn't) change that.

Applied to the togreg branch of iio.git but only pushed out as testing
until I can rebase that branch on rc1 in 2 weeks time or so.

Thanks,

Jonathan

> ---
> v1->v2:
>  * Added Rb tag from Andy
>  * Drooped id variable removal from commit description.
> ---
>  drivers/iio/pressure/ms5637.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/iio/pressure/ms5637.c b/drivers/iio/pressure/ms5637.c
> index 9b3abffb724b..ac30d76285d1 100644
> --- a/drivers/iio/pressure/ms5637.c
> +++ b/drivers/iio/pressure/ms5637.c
> @@ -144,7 +144,6 @@ static const struct iio_info ms5637_info = {
>  
>  static int ms5637_probe(struct i2c_client *client)
>  {
> -	const struct i2c_device_id *id = i2c_client_get_device_id(client);
>  	const struct ms_tp_data *data;
>  	struct ms_tp_dev *dev_data;
>  	struct iio_dev *indio_dev;
> @@ -159,10 +158,7 @@ static int ms5637_probe(struct i2c_client *client)
>  		return -EOPNOTSUPP;
>  	}
>  
> -	if (id)
> -		data = (const struct ms_tp_data *)id->driver_data;
> -	else
> -		data = device_get_match_data(&client->dev);
> +	data = i2c_get_match_data(client);
>  	if (!data)
>  		return -EINVAL;
>