Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (w83781d) Remove use of i2c_match_id()

The function i2c_match_id() is used to fetch the matching ID from
the i2c_device_id table. This is often used to then retrieve the
matching driver_data. This can be done in one step with the helper
i2c_get_match_data().

This helper has a couple other benefits:
* It doesn't need the i2c_device_id passed in so we do not need
to have that forward declared, allowing us to remove those or
move the i2c_device_id table down to its more natural spot
with the other module info.
* It also checks for device match data, which allows for OF and
ACPI based probing. That means we do not have to manually check
those first and can remove those checks.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240403203633.914389-31-afd@ti.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Andrew Davis and committed by
Guenter Roeck
00dcf379 38a085f9

+1 -3
+1 -3
drivers/hwmon/w83781d.c
··· 1192 1192 sysfs_remove_group(&dev->kobj, &w83781d_group_other); 1193 1193 } 1194 1194 1195 - static const struct i2c_device_id w83781d_ids[]; 1196 - 1197 1195 static int w83781d_probe(struct i2c_client *client) 1198 1196 { 1199 1197 struct device *dev = &client->dev; ··· 1206 1208 mutex_init(&data->lock); 1207 1209 mutex_init(&data->update_lock); 1208 1210 1209 - data->type = i2c_match_id(w83781d_ids, client)->driver_data; 1211 + data->type = (uintptr_t)i2c_get_match_data(client); 1210 1212 data->client = client; 1211 1213 1212 1214 /* attach secondary i2c lm75-like clients */