mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-28 16:53:49 +00:00
hwmon: (ad7418) 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-2-afd@ti.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
b1ea8f7a30
commit
244f1664fe
@ -230,8 +230,6 @@ static void ad7418_init_client(struct i2c_client *client)
|
||||
}
|
||||
}
|
||||
|
||||
static const struct i2c_device_id ad7418_id[];
|
||||
|
||||
static int ad7418_probe(struct i2c_client *client)
|
||||
{
|
||||
struct device *dev = &client->dev;
|
||||
@ -252,10 +250,7 @@ static int ad7418_probe(struct i2c_client *client)
|
||||
|
||||
mutex_init(&data->lock);
|
||||
data->client = client;
|
||||
if (dev->of_node)
|
||||
data->type = (uintptr_t)of_device_get_match_data(dev);
|
||||
else
|
||||
data->type = i2c_match_id(ad7418_id, client)->driver_data;
|
||||
data->type = (uintptr_t)i2c_get_match_data(client);
|
||||
|
||||
switch (data->type) {
|
||||
case ad7416:
|
||||
|
Loading…
Reference in New Issue
Block a user