2020-08-21 16:24:50

by Stephen Kitt

Subject: [PATCH] hwmon: (f75375s) use simple i2c probe

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 <[email protected]>
---
drivers/hwmon/f75375s.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index eb847a7d6b83..3e567be60fb1 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -113,8 +113,7 @@ struct f75375_data {

static int f75375_detect(struct i2c_client *client,
struct i2c_board_info *info);
-static int f75375_probe(struct i2c_client *client,
- const struct i2c_device_id *id);
+static int f75375_probe(struct i2c_client *client);
static int f75375_remove(struct i2c_client *client);

static const struct i2c_device_id f75375_id[] = {
@@ -130,7 +129,7 @@ static struct i2c_driver f75375_driver = {
.driver = {
.name = "f75375",
},
- .probe = f75375_probe,
+ .probe_new = f75375_probe,
.remove = f75375_remove,
.id_table = f75375_id,
.detect = f75375_detect,
@@ -814,8 +813,7 @@ static void f75375_init(struct i2c_client *client, struct f75375_data *data,

}

-static int f75375_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int f75375_probe(struct i2c_client *client)
{
struct f75375_data *data;
struct f75375s_platform_data *f75375s_pdata =
@@ -832,7 +830,7 @@ static int f75375_probe(struct i2c_client *client,

i2c_set_clientdata(client, data);
mutex_init(&data->update_lock);
- data->kind = id->driver_data;
+ data->kind = i2c_match_id(f75375_id, client)->driver_data;

err = sysfs_create_group(&client->dev.kobj, &f75375_group);
if (err)
--
2.25.4

2020-08-21 18:32:20

by Guenter Roeck

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

On Fri, Aug 21, 2020 at 06:01:59PM +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 <[email protected]>

Applied.

Thanks,
Guenter

> ---
> drivers/hwmon/f75375s.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
> index eb847a7d6b83..3e567be60fb1 100644
> --- a/drivers/hwmon/f75375s.c
> +++ b/drivers/hwmon/f75375s.c
> @@ -113,8 +113,7 @@ struct f75375_data {
>
> static int f75375_detect(struct i2c_client *client,
> struct i2c_board_info *info);
> -static int f75375_probe(struct i2c_client *client,
> - const struct i2c_device_id *id);
> +static int f75375_probe(struct i2c_client *client);
> static int f75375_remove(struct i2c_client *client);
>
> static const struct i2c_device_id f75375_id[] = {
> @@ -130,7 +129,7 @@ static struct i2c_driver f75375_driver = {
> .driver = {
> .name = "f75375",
> },
> - .probe = f75375_probe,
> + .probe_new = f75375_probe,
> .remove = f75375_remove,
> .id_table = f75375_id,
> .detect = f75375_detect,
> @@ -814,8 +813,7 @@ static void f75375_init(struct i2c_client *client, struct f75375_data *data,
>
> }
>
> -static int f75375_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int f75375_probe(struct i2c_client *client)
> {
> struct f75375_data *data;
> struct f75375s_platform_data *f75375s_pdata =
> @@ -832,7 +830,7 @@ static int f75375_probe(struct i2c_client *client,
>
> i2c_set_clientdata(client, data);
> mutex_init(&data->update_lock);
> - data->kind = id->driver_data;
> + data->kind = i2c_match_id(f75375_id, client)->driver_data;
>
> err = sysfs_create_group(&client->dev.kobj, &f75375_group);
> if (err)