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

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

authored by

Andrew Davis and committed by
Guenter Roeck
698d692c 9072777d

+1 -3
+1 -3
drivers/hwmon/ds1621.c
··· 342 342 }; 343 343 __ATTRIBUTE_GROUPS(ds1621); 344 344 345 - static const struct i2c_device_id ds1621_id[]; 346 - 347 345 static int ds1621_probe(struct i2c_client *client) 348 346 { 349 347 struct ds1621_data *data; ··· 354 356 355 357 mutex_init(&data->update_lock); 356 358 357 - data->kind = i2c_match_id(ds1621_id, client)->driver_data; 359 + data->kind = (uintptr_t)i2c_get_match_data(client); 358 360 data->client = client; 359 361 360 362 /* Initialize the DS1621 chip */