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

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: tpa6130a2: 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://patch.msgid.link/20241203200001.197295-19-afd@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Andrew Davis and committed by
Mark Brown cb47dced 2a169c45

+1 -3
+1 -3
sound/soc/codecs/tpa6130a2.c
··· 222 222 struct tpa6130a2_data *data; 223 223 struct tpa6130a2_platform_data *pdata = client->dev.platform_data; 224 224 struct device_node *np = client->dev.of_node; 225 - const struct i2c_device_id *id; 226 225 const char *regulator; 227 226 unsigned int version; 228 227 int ret; ··· 250 251 251 252 i2c_set_clientdata(client, data); 252 253 253 - id = i2c_match_id(tpa6130a2_id, client); 254 - data->id = id->driver_data; 254 + data->id = (uintptr_t)i2c_get_match_data(client); 255 255 256 256 if (data->power_gpio >= 0) { 257 257 ret = devm_gpio_request(dev, data->power_gpio,