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

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

authored by

Andrew Davis and committed by
Guenter Roeck
f1230f75 de5fb06c

+3 -3
+3 -3
drivers/hwmon/mcp3021.c
··· 116 116 .info = mcp3021_info, 117 117 }; 118 118 119 - static const struct i2c_device_id mcp3021_id[]; 120 - 121 119 static int mcp3021_probe(struct i2c_client *client) 122 120 { 123 121 struct mcp3021_data *data = NULL; 124 122 struct device_node *np = client->dev.of_node; 125 123 struct device *hwmon_dev; 124 + enum chips type; 126 125 127 126 if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) 128 127 return -ENODEV; ··· 148 149 data->vdd = MCP3021_VDD_REF_DEFAULT; 149 150 } 150 151 151 - switch (i2c_match_id(mcp3021_id, client)->driver_data) { 152 + type = (uintptr_t)i2c_get_match_data(client); 153 + switch (type) { 152 154 case mcp3021: 153 155 data->sar_shift = MCP3021_SAR_SHIFT; 154 156 data->sar_mask = MCP3021_SAR_MASK;