]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
hwmon: (pmbus/q54sj108a2) Remove use of i2c_match_id()
authorAndrew Davis <afd@ti.com>
Fri, 6 Mar 2026 17:16:48 +0000 (11:16 -0600)
committerGuenter Roeck <linux@roeck-us.net>
Tue, 31 Mar 2026 02:45:06 +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 also checks for device match data, which means we do not have
   to manually check that first.

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

index d5d60a9af8c589f47193e8a182d25a0ba593a8b3..7e799f36f923edfd8833ab242578b17b5b23d5ab 100644 (file)
@@ -292,10 +292,7 @@ static int q54sj108a2_probe(struct i2c_client *client)
                                     I2C_FUNC_SMBUS_BLOCK_DATA))
                return -ENODEV;
 
-       if (client->dev.of_node)
-               chip_id = (enum chips)(unsigned long)of_device_get_match_data(dev);
-       else
-               chip_id = i2c_match_id(q54sj108a2_id, client)->driver_data;
+       chip_id = (enum chips)(uintptr_t)i2c_get_match_data(client);
 
        ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, buf);
        if (ret < 0) {