[PATCH] hwmon: (dme1737) use simple i2c probe

[PATCH] hwmon: (dme1737) use simple i2c probe

[Stephen Kitt]

As part of the ongoing i2c transition to the simple probe
("probe_new"), this patch uses i2c_match_id to retrieve the
driver_data for the probed device. The id parameter is thus no longer
necessary and the simple probe can be used instead.

Signed-off-by: Stephen Kitt <steve@sk2.org>
---
 drivers/hwmon/dme1737.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index c3472b73fa79..c1e4cfb40c3d 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -2461,8 +2461,9 @@ static int dme1737_i2c_detect(struct i2c_client *client,
 	return 0;
 }
 
-static int dme1737_i2c_probe(struct i2c_client *client,
-			     const struct i2c_device_id *id)
+static const struct i2c_device_id dme1737_id[];
+
+static int dme1737_i2c_probe(struct i2c_client *client)
 {
 	struct dme1737_data *data;
 	struct device *dev = &client->dev;
@@ -2473,7 +2474,7 @@ static int dme1737_i2c_probe(struct i2c_client *client,
 		return -ENOMEM;
 
 	i2c_set_clientdata(client, data);
-	data->type = id->driver_data;
+	data->type = i2c_match_id(dme1737_id, client)->driver_data;
 	data->client = client;
 	data->name = client->name;
 	mutex_init(&data->update_lock);
@@ -2529,7 +2530,7 @@ static struct i2c_driver dme1737_i2c_driver = {
 	.driver = {
 		.name = "dme1737",
 	},
-	.probe = dme1737_i2c_probe,
+	.probe_new = dme1737_i2c_probe,
 	.remove = dme1737_i2c_remove,
 	.id_table = dme1737_id,
 	.detect = dme1737_i2c_detect,
-- 
2.25.4

Re: [PATCH] hwmon: (dme1737) use simple i2c probe

[Guenter Roeck]

On Fri, Aug 21, 2020 at 06:00:35PM +0200, Stephen Kitt wrote:
> As part of the ongoing i2c transition to the simple probe
> ("probe_new"), this patch uses i2c_match_id to retrieve the
> driver_data for the probed device. The id parameter is thus no longer
> necessary and the simple probe can be used instead.
> 
> Signed-off-by: Stephen Kitt <steve@sk2.org>

Applied.

Thanks,
Guenter

> ---
>  drivers/hwmon/dme1737.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
> index c3472b73fa79..c1e4cfb40c3d 100644
> --- a/drivers/hwmon/dme1737.c
> +++ b/drivers/hwmon/dme1737.c
> @@ -2461,8 +2461,9 @@ static int dme1737_i2c_detect(struct i2c_client *client,
>  	return 0;
>  }
>  
> -static int dme1737_i2c_probe(struct i2c_client *client,
> -			     const struct i2c_device_id *id)
> +static const struct i2c_device_id dme1737_id[];
> +
> +static int dme1737_i2c_probe(struct i2c_client *client)
>  {
>  	struct dme1737_data *data;
>  	struct device *dev = &client->dev;
> @@ -2473,7 +2474,7 @@ static int dme1737_i2c_probe(struct i2c_client *client,
>  		return -ENOMEM;
>  
>  	i2c_set_clientdata(client, data);
> -	data->type = id->driver_data;
> +	data->type = i2c_match_id(dme1737_id, client)->driver_data;
>  	data->client = client;
>  	data->name = client->name;
>  	mutex_init(&data->update_lock);
> @@ -2529,7 +2530,7 @@ static struct i2c_driver dme1737_i2c_driver = {
>  	.driver = {
>  		.name = "dme1737",
>  	},
> -	.probe = dme1737_i2c_probe,
> +	.probe_new = dme1737_i2c_probe,
>  	.remove = dme1737_i2c_remove,
>  	.id_table = dme1737_id,
>  	.detect = dme1737_i2c_detect,