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

diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 2adf744c652634a1539f7c20ca9102e5e8768b01..790e2ae6dc182d537ff82d82e862cafe7c54d1c8 100644 (file)
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2543,8 +2543,6 @@ MODULE_DEVICE_TABLE(i2c, max98090_i2c_id);
 static int max98090_i2c_probe(struct i2c_client *i2c)
 {
        struct max98090_priv *max98090;
-       const struct acpi_device_id *acpi_id;
-       kernel_ulong_t driver_data = 0;
        int ret;
 
        pr_debug("max98090_i2c_probe\n");
@@ -2554,21 +2552,7 @@ static int max98090_i2c_probe(struct i2c_client *i2c)
        if (max98090 == NULL)
                return -ENOMEM;
 
-       if (ACPI_HANDLE(&i2c->dev)) {
-               acpi_id = acpi_match_device(i2c->dev.driver->acpi_match_table,
-                                           &i2c->dev);
-               if (!acpi_id) {
-                       dev_err(&i2c->dev, "No driver data\n");
-                       return -EINVAL;
-               }
-               driver_data = acpi_id->driver_data;
-       } else {
-               const struct i2c_device_id *i2c_id =
-                       i2c_match_id(max98090_i2c_id, i2c);
-               driver_data = i2c_id->driver_data;
-       }
-
-       max98090->devtype = driver_data;
+       max98090->devtype = (uintptr_t)i2c_get_match_data(i2c);
        i2c_set_clientdata(i2c, max98090);
        max98090->pdata = i2c->dev.platform_data;