summaryrefslogtreecommitdiff
path: root/drivers/hwmon/adc128d818.c
diff options
context:
space:
mode:
authorStephen Kitt <steve@sk2.org>2020-08-21 19:03:54 +0300
committerGuenter Roeck <linux@roeck-us.net>2020-09-23 19:42:40 +0300
commit673afe466166cda94053d2d2400e669fe19f8050 (patch)
tree358bd6aa76103330dd02854a6eacd61780dc4680 /drivers/hwmon/adc128d818.c
parentc1e60c0d571b6c0264ae18f5e2cfdb34569da762 (diff)
downloadlinux-673afe466166cda94053d2d2400e669fe19f8050.tar.xz
hwmon: use simple i2c probe function (take 2)
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 to call i2c_match_id() with the same level of error-handling (if any) as before. This patch wraps up the transition for hwmon, with four stragglers not included in the previous large patch. Signed-off-by: Stephen Kitt <steve@sk2.org> Link: https://lore.kernel.org/r/20200821160354.594715-1-steve@sk2.org Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/adc128d818.c')
-rw-r--r--drivers/hwmon/adc128d818.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hwmon/adc128d818.c b/drivers/hwmon/adc128d818.c
index 571d5454c6b2..6c9a906631b8 100644
--- a/drivers/hwmon/adc128d818.c
+++ b/drivers/hwmon/adc128d818.c
@@ -427,8 +427,7 @@ static int adc128_init_client(struct adc128_data *data)
return 0;
}
-static int adc128_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int adc128_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct regulator *regulator;
@@ -524,7 +523,7 @@ static struct i2c_driver adc128_driver = {
.name = "adc128d818",
.of_match_table = of_match_ptr(adc128_of_match),
},
- .probe = adc128_probe,
+ .probe_new = adc128_probe,
.remove = adc128_remove,
.id_table = adc128_id,
.detect = adc128_detect,