summaryrefslogtreecommitdiff
path: root/drivers/hwmon/max6639.c
diff options
context:
space:
mode:
authorStephen Kitt <steve@sk2.org>2020-08-13 19:02:22 +0300
committerGuenter Roeck <linux@roeck-us.net>2020-09-23 19:42:39 +0300
commit6748703856d461f8cd62b72ebca51040e06cb310 (patch)
treead23d2784dca09057da09414453b17e114f150a7 /drivers/hwmon/max6639.c
parentdd43193976b9a7b2affe8fb71780bb96d16a8449 (diff)
downloadlinux-6748703856d461f8cd62b72ebca51040e06cb310.tar.xz
hwmon: use simple i2c probe function
Many hwmon drivers don't use the id information provided by the old i2c probe function, and the remainder can easily be adapted to the new form ("probe_new") by calling i2c_match_id explicitly. This avoids scanning the identifier tables during probes. Drivers which didn't use the id are converted as-is; drivers which did are modified as follows: * if the information in i2c_client is sufficient, that's used instead (client->name); * anything else is handled by calling i2c_match_id() with the same level of error-handling (if any) as before. A few drivers aren't included in this patch because they have a different set of maintainers. They will be covered by other patches. Signed-off-by: Stephen Kitt <steve@sk2.org> Link: https://lore.kernel.org/r/20200813160222.1503401-1-steve@sk2.org Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/max6639.c')
-rw-r--r--drivers/hwmon/max6639.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c
index 2d56e97aa5fa..b71899c641fa 100644
--- a/drivers/hwmon/max6639.c
+++ b/drivers/hwmon/max6639.c
@@ -516,8 +516,7 @@ static int max6639_detect(struct i2c_client *client,
return 0;
}
-static int max6639_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int max6639_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct max6639_data *data;
@@ -581,7 +580,7 @@ static struct i2c_driver max6639_driver = {
.name = "max6639",
.pm = &max6639_pm_ops,
},
- .probe = max6639_probe,
+ .probe_new = max6639_probe,
.id_table = max6639_id,
.detect = max6639_detect,
.address_list = normal_i2c,