]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
hwmon: (pmbus) Remove use of i2c_match_id()
authorAndrew Davis <afd@ti.com>
Fri, 6 Mar 2026 17:16:47 +0000 (11:16 -0600)
committerGuenter Roeck <linux@roeck-us.net>
Tue, 31 Mar 2026 02:45:05 +0000 (19:45 -0700)
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 another benefit:
 * It doesn't need the i2c_device_id passed in so we do not need
   to have that forward declared, allowing us to remove that.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20260306171652.951274-7-afd@ti.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/pmbus/pmbus.c

index 920cd5408141a25977ee1876cd42598c34ba7430..d1844c7a51eef68eacaae2f42cb6355bebcbd667 100644 (file)
@@ -20,8 +20,6 @@ struct pmbus_device_info {
        u32 flags;
 };
 
-static const struct i2c_device_id pmbus_id[];
-
 /*
  * Find sensor groups and status registers on each page.
  */
@@ -174,7 +172,7 @@ static int pmbus_probe(struct i2c_client *client)
        if (!info)
                return -ENOMEM;
 
-       device_info = (struct pmbus_device_info *)i2c_match_id(pmbus_id, client)->driver_data;
+       device_info = (struct pmbus_device_info *)i2c_get_match_data(client);
        if (device_info->flags) {
                pdata = devm_kzalloc(dev, sizeof(struct pmbus_platform_data),
                                     GFP_KERNEL);