Commit 4e1b4d22 authored by Stephen Kitt's avatar Stephen Kitt Committed by Guenter Roeck

hwmon: (dme1737) 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: default avatarStephen Kitt <steve@sk2.org>
Link: https://lore.kernel.org/r/20200821160035.590142-1-steve@sk2.orgSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent f7bd7b54
...@@ -2461,8 +2461,9 @@ static int dme1737_i2c_detect(struct i2c_client *client, ...@@ -2461,8 +2461,9 @@ static int dme1737_i2c_detect(struct i2c_client *client,
return 0; return 0;
} }
static int dme1737_i2c_probe(struct i2c_client *client, static const struct i2c_device_id dme1737_id[];
const struct i2c_device_id *id)
static int dme1737_i2c_probe(struct i2c_client *client)
{ {
struct dme1737_data *data; struct dme1737_data *data;
struct device *dev = &client->dev; struct device *dev = &client->dev;
...@@ -2473,7 +2474,7 @@ static int dme1737_i2c_probe(struct i2c_client *client, ...@@ -2473,7 +2474,7 @@ static int dme1737_i2c_probe(struct i2c_client *client,
return -ENOMEM; return -ENOMEM;
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
data->type = id->driver_data; data->type = i2c_match_id(dme1737_id, client)->driver_data;
data->client = client; data->client = client;
data->name = client->name; data->name = client->name;
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
...@@ -2529,7 +2530,7 @@ static struct i2c_driver dme1737_i2c_driver = { ...@@ -2529,7 +2530,7 @@ static struct i2c_driver dme1737_i2c_driver = {
.driver = { .driver = {
.name = "dme1737", .name = "dme1737",
}, },
.probe = dme1737_i2c_probe, .probe_new = dme1737_i2c_probe,
.remove = dme1737_i2c_remove, .remove = dme1737_i2c_remove,
.id_table = dme1737_id, .id_table = dme1737_id,
.detect = dme1737_i2c_detect, .detect = dme1737_i2c_detect,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment