From: Andrew Davis Date: Wed, 3 Apr 2024 20:36:19 +0000 (-0500) Subject: hwmon: (lm90) Remove use of i2c_match_id() X-Git-Tag: io_uring-6.11-20240722~120^2~74 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=711e2e4f690dbd46d8cdc6be3b1491e95dfc4426;p=linux-block.git hwmon: (lm90) 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 Link: https://lore.kernel.org/r/20240403203633.914389-18-afd@ti.com Signed-off-by: Guenter Roeck --- diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 40d9e21b528c..ca5c52b38c0f 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -2723,10 +2723,7 @@ static int lm90_probe(struct i2c_client *client) INIT_WORK(&data->report_work, lm90_report_alarms); /* Set the device type */ - if (client->dev.of_node) - data->kind = (uintptr_t)of_device_get_match_data(&client->dev); - else - data->kind = i2c_match_id(lm90_id, client)->driver_data; + data->kind = (uintptr_t)i2c_get_match_data(client); /* * Different devices have different alarm bits triggering the