ASoC: tas5720: 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-15-afd@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tas5720.c b/sound/soc/codecs/tas5720.c
index 6dd6c0896effffc11b3ad3cd833ce3328ebafb25..f0361822061fdb437479b291c2fd549f293b5f20 100644 (file)
--- a/sound/soc/codecs/tas5720.c
+++ b/sound/soc/codecs/tas5720.c
@@ -43,7 +43,6 @@ static const char * const tas5720_supply_names[] = {
 struct tas5720_data {
        struct snd_soc_component *component;
        struct regmap *regmap;
-       struct i2c_client *tas5720_client;
        enum tas572x_type devtype;
        struct regulator_bulk_data supplies[TAS5720_NUM_SUPPLIES];
        struct delayed_work fault_check_work;
@@ -729,7 +728,6 @@ static int tas5720_probe(struct i2c_client *client)
        struct device *dev = &client->dev;
        struct tas5720_data *data;
        const struct regmap_config *regmap_config;
-       const struct i2c_device_id *id;
        int ret;
        int i;
 
@@ -737,11 +735,9 @@ static int tas5720_probe(struct i2c_client *client)
        if (!data)
                return -ENOMEM;
 
-       id = i2c_match_id(tas5720_id, client);
-       data->tas5720_client = client;
-       data->devtype = id->driver_data;
+       data->devtype = (uintptr_t)i2c_get_match_data(client);
 
-       switch (id->driver_data) {
+       switch (data->devtype) {
        case TAS5720:
                regmap_config = &tas5720_regmap_config;
                break;
@@ -774,7 +770,7 @@ static int tas5720_probe(struct i2c_client *client)
 
        dev_set_drvdata(dev, data);
 
-       switch (id->driver_data) {
+       switch (data->devtype) {
        case TAS5720:
                ret = devm_snd_soc_register_component(&client->dev,
                                        &soc_component_dev_tas5720,