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

hwmon: (lm85) 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-17-afd@ti.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Andrew Davis and committed by
Guenter Roeck
4cfd3cee 9339bed9

+1 -6
+1 -6
drivers/hwmon/lm85.c
··· 1544 1544 return 0; 1545 1545 } 1546 1546 1547 - static const struct i2c_device_id lm85_id[]; 1548 - 1549 1547 static int lm85_probe(struct i2c_client *client) 1550 1548 { 1551 1549 struct device *dev = &client->dev; ··· 1556 1558 return -ENOMEM; 1557 1559 1558 1560 data->client = client; 1559 - if (client->dev.of_node) 1560 - data->type = (uintptr_t)of_device_get_match_data(&client->dev); 1561 - else 1562 - data->type = i2c_match_id(lm85_id, client)->driver_data; 1561 + data->type = (uintptr_t)i2c_get_match_data(client); 1563 1562 mutex_init(&data->update_lock); 1564 1563 1565 1564 /* Fill in the chip specific driver values */