Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Andrew Davis and committed by
Guenter Roeck
64306a47 f147dbd7

+1 -3
+1 -3
drivers/hwmon/shtc1.c
··· 186 186 } 187 187 } 188 188 189 - static const struct i2c_device_id shtc1_id[]; 190 - 191 189 static int shtc1_probe(struct i2c_client *client) 192 190 { 193 191 int ret; ··· 193 195 char id_reg_buf[2]; 194 196 struct shtc1_data *data; 195 197 struct device *hwmon_dev; 196 - enum shtcx_chips chip = i2c_match_id(shtc1_id, client)->driver_data; 198 + enum shtcx_chips chip = (uintptr_t)i2c_get_match_data(client); 197 199 struct i2c_adapter *adap = client->adapter; 198 200 struct device *dev = &client->dev; 199 201 struct device_node *np = dev->of_node;