Skip to content

Commit

Permalink
hwmon: (dme1737) use simple i2c probe
Browse files Browse the repository at this point in the history
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>
Link: https://lore.kernel.org/r/20200821160035.590142-1-steve@sk2.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  • Loading branch information
Stephen Kitt authored and Guenter Roeck committed Sep 23, 2020
1 parent f7bd7b5 commit 4e1b4d2
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/hwmon/dme1737.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 4e1b4d2

Please sign in to comment.