ASoC: tpa6130: use i2c_match_id and simple i2c probe

As part of the ongoing i2c transition to the simple probe
("probe_new"), this patch uses i2c_match_id to retrieve the
driver_data for the probed device. The id parameter is thus no longer
necessary and the simple probe can be used instead.

The i2c id table is moved up before the probe function, as suggested
by Wolfram Sang.

Signed-off-by: Stephen Kitt <steve@sk2.org>
Link: https://lore.kernel.org/r/20220501171009.45060-1-steve@sk2.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index e2d7ae6..8c00db3 100644 (file)
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -209,13 +209,20 @@ static const struct regmap_config tpa6130a2_regmap_config = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int tpa6130a2_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static const struct i2c_device_id tpa6130a2_id[] = {
+       { "tpa6130a2", TPA6130A2 },
+       { "tpa6140a2", TPA6140A2 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, tpa6130a2_id);
+
+static int tpa6130a2_probe(struct i2c_client *client)
 {
        struct device *dev;
        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;
@@ -244,6 +251,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;
 
        if (data->power_gpio >= 0) {
@@ -297,13 +305,6 @@ static int tpa6130a2_probe(struct i2c_client *client,
                        &tpa6130a2_component_driver, NULL, 0);
 }
 
-static const struct i2c_device_id tpa6130a2_id[] = {
-       { "tpa6130a2", TPA6130A2 },
-       { "tpa6140a2", TPA6140A2 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, tpa6130a2_id);
-
 #if IS_ENABLED(CONFIG_OF)
 static const struct of_device_id tpa6130a2_of_match[] = {
        { .compatible = "ti,tpa6130a2", },
@@ -318,7 +319,7 @@ static struct i2c_driver tpa6130a2_i2c_driver = {
                .name = "tpa6130a2",
                .of_match_table = of_match_ptr(tpa6130a2_of_match),
        },
-       .probe = tpa6130a2_probe,
+       .probe_new = tpa6130a2_probe,
        .id_table = tpa6130a2_id,
 };