From: Andrew Davis Date: Fri, 6 Mar 2026 17:16:44 +0000 (-0600) Subject: hwmon: (pmbus/isl68137) Remove use of i2c_match_id() X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfea13489052b164355f8da76fbd363992fb9752;p=thirdparty%2Fkernel%2Flinux.git hwmon: (pmbus/isl68137) 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 that. * It also checks for device match data, which allows for OF and ACPI based probing. Signed-off-by: Andrew Davis Link: https://lore.kernel.org/r/20260306171652.951274-4-afd@ti.com Signed-off-by: Guenter Roeck --- diff --git a/drivers/hwmon/pmbus/isl68137.c b/drivers/hwmon/pmbus/isl68137.c index 3e3a887aad050..48059ac4a08be 100644 --- a/drivers/hwmon/pmbus/isl68137.c +++ b/drivers/hwmon/pmbus/isl68137.c @@ -90,8 +90,6 @@ struct isl68137_data { #define to_isl68137_data(x) container_of(x, struct isl68137_data, info) -static const struct i2c_device_id raa_dmpvr_id[]; - static ssize_t isl68137_avs_enable_show_page(struct i2c_client *client, int page, char *buf) @@ -393,7 +391,7 @@ static int isl68137_probe(struct i2c_client *client) memcpy(&data->info, &raa_dmpvr_info, sizeof(data->info)); info = &data->info; - switch (i2c_match_id(raa_dmpvr_id, client)->driver_data) { + switch ((uintptr_t)i2c_get_match_data(client)) { case raa_dmpvr1_2rail: info->pages = 2; info->R[PSC_VOLTAGE_IN] = 3;