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

diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index d8415d1f21fc518bb679f7943d60baf9b37b13d6..f8b5d972191ee720cb63df00dd2734f249395b3e 100644 (file)
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -612,8 +612,6 @@ static const struct attribute_group ina226_group = {
        .attrs = ina226_attrs,
 };
 
-static const struct i2c_device_id ina2xx_id[];
-
 static int ina2xx_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
@@ -623,10 +621,7 @@ static int ina2xx_probe(struct i2c_client *client)
        int ret, group = 0;
        enum ina2xx_ids chip;
 
-       if (client->dev.of_node)
-               chip = (uintptr_t)of_device_get_match_data(&client->dev);
-       else
-               chip = i2c_match_id(ina2xx_id, client)->driver_data;
+       chip = (uintptr_t)i2c_get_match_data(client);
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)