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

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 829bf055622a7f966849bbfaeec1d9e3b3f6ba93..aef82532f8cfe34300dc85fcfd6e313c9b5f741b 100644 (file)
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2196,18 +2196,7 @@ static int wm8904_i2c_probe(struct i2c_client *i2c)
                return ret;
        }
 
-       if (i2c->dev.of_node) {
-               const struct of_device_id *match;
-
-               match = of_match_node(wm8904_of_match, i2c->dev.of_node);
-               if (match == NULL)
-                       return -EINVAL;
-               wm8904->devtype = (uintptr_t)match->data;
-       } else {
-               const struct i2c_device_id *id =
-                       i2c_match_id(wm8904_i2c_id, i2c);
-               wm8904->devtype = id->driver_data;
-       }
+       wm8904->devtype = (uintptr_t)i2c_get_match_data(i2c);
 
        i2c_set_clientdata(i2c, wm8904);
        wm8904->pdata = i2c->dev.platform_data;