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

diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 68c21000235759f678a83ce182103584498d0a78..1c244ed75122eaa76516b3fc608ad8dee2c5bf27 100644 (file)
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -1544,8 +1544,6 @@ static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info)
        return 0;
 }
 
-static const struct i2c_device_id lm85_id[];
-
 static int lm85_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
@@ -1558,10 +1556,7 @@ static int lm85_probe(struct i2c_client *client)
                return -ENOMEM;
 
        data->client = client;
-       if (client->dev.of_node)
-               data->type = (uintptr_t)of_device_get_match_data(&client->dev);
-       else
-               data->type = i2c_match_id(lm85_id, client)->driver_data;
+       data->type = (uintptr_t)i2c_get_match_data(client);
        mutex_init(&data->update_lock);
 
        /* Fill in the chip specific driver values */