Skip to content

Commit

Permalink
hwmon: (tmp513) 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/20200821160231.592571-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 673afe4 commit e3b9f69
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/hwmon/tmp513.c
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,7 @@ static int tmp51x_configure(struct device *dev, struct tmp51x_data *data)
return 0;
}

static int tmp51x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int tmp51x_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct tmp51x_data *data;
Expand All @@ -724,7 +723,7 @@ static int tmp51x_probe(struct i2c_client *client,
if (client->dev.of_node)
data->id = (enum tmp51x_ids)device_get_match_data(&client->dev);
else
data->id = id->driver_data;
data->id = i2c_match_id(tmp51x_id, client)->driver_data;

ret = tmp51x_configure(dev, data);
if (ret < 0) {
Expand All @@ -751,7 +750,7 @@ static int tmp51x_probe(struct i2c_client *client,
if (IS_ERR(hwmon_dev))
return PTR_ERR(hwmon_dev);

dev_dbg(dev, "power monitor %s\n", id->name);
dev_dbg(dev, "power monitor %s\n", client->name);

return 0;
}
Expand All @@ -761,7 +760,7 @@ static struct i2c_driver tmp51x_driver = {
.name = "tmp51x",
.of_match_table = of_match_ptr(tmp51x_of_match),
},
.probe = tmp51x_probe,
.probe_new = tmp51x_probe,
.id_table = tmp51x_id,
};

Expand Down

0 comments on commit e3b9f69

Please sign in to comment.