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>

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 5bc486283fdee9b1edd932a61b4887416c242c00..b5472fa1bddab3d69b88c040ed561e8b5d9d1d0d 100644 (file)
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -222,7 +222,6 @@ static int tpa6130a2_probe(struct i2c_client *client)
        struct tpa6130a2_data *data;
        struct tpa6130a2_platform_data *pdata = client->dev.platform_data;
        struct device_node *np = client->dev.of_node;
-       const struct i2c_device_id *id;
        const char *regulator;
        unsigned int version;
        int ret;
@@ -251,8 +250,7 @@ static int tpa6130a2_probe(struct i2c_client *client)
 
        i2c_set_clientdata(client, data);
 
-       id = i2c_match_id(tpa6130a2_id, client);
-       data->id = id->driver_data;
+       data->id = (uintptr_t)i2c_get_match_data(client);
 
        if (data->power_gpio >= 0) {
                ret = devm_gpio_request(dev, data->power_gpio,