ASoC: alc56*: 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 tables are 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/20220415160613.148882-3-steve@sk2.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index b10357a6d6559054258191eb8ee15e4e4cece0d4..8e6235d2c544507c90657406adeadb4ce09052eb 100644 (file)
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -968,14 +968,21 @@ static const struct regmap_config alc5623_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
+static const struct i2c_device_id alc5623_i2c_table[] = {
+       {"alc5621", 0x21},
+       {"alc5622", 0x22},
+       {"alc5623", 0x23},
+       {}
+};
+MODULE_DEVICE_TABLE(i2c, alc5623_i2c_table);
+
 /*
  * ALC5623 2 wire address is determined by A1 pin
  * state during powerup.
  *    low  = 0x1a
  *    high = 0x1b
  */
-static int alc5623_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int alc5623_i2c_probe(struct i2c_client *client)
 {
        struct alc5623_platform_data *pdata;
        struct alc5623_priv *alc5623;
@@ -983,6 +990,7 @@ static int alc5623_i2c_probe(struct i2c_client *client,
        unsigned int vid1, vid2;
        int ret;
        u32 val32;
+       const struct i2c_device_id *id;
 
        alc5623 = devm_kzalloc(&client->dev, sizeof(struct alc5623_priv),
                               GFP_KERNEL);
@@ -1009,6 +1017,8 @@ static int alc5623_i2c_probe(struct i2c_client *client,
        }
        vid2 >>= 8;
 
+       id = i2c_match_id(alc5623_i2c_table, client);
+
        if ((vid1 != 0x10ec) || (vid2 != id->driver_data)) {
                dev_err(&client->dev, "unknown or wrong codec\n");
                dev_err(&client->dev, "Expected %x:%lx, got %x:%x\n",
@@ -1060,14 +1070,6 @@ static int alc5623_i2c_probe(struct i2c_client *client,
        return ret;
 }
 
-static const struct i2c_device_id alc5623_i2c_table[] = {
-       {"alc5621", 0x21},
-       {"alc5622", 0x22},
-       {"alc5623", 0x23},
-       {}
-};
-MODULE_DEVICE_TABLE(i2c, alc5623_i2c_table);
-
 #ifdef CONFIG_OF
 static const struct of_device_id alc5623_of_match[] = {
        { .compatible = "realtek,alc5623", },
@@ -1082,7 +1084,7 @@ static struct i2c_driver alc5623_i2c_driver = {
                .name = "alc562x-codec",
                .of_match_table = of_match_ptr(alc5623_of_match),
        },
-       .probe = alc5623_i2c_probe,
+       .probe_new = alc5623_i2c_probe,
        .id_table = alc5623_i2c_table,
 };
 

diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index 6d7af3736a91b415bd9c45e1e7fa9ec2dee400ac..641bdfddae160258354e04f748ec2d31db106930 100644 (file)
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -1092,18 +1092,24 @@ static const struct regmap_config alc5632_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
+static const struct i2c_device_id alc5632_i2c_table[] = {
+       {"alc5632", 0x5c},
+       {}
+};
+MODULE_DEVICE_TABLE(i2c, alc5632_i2c_table);
+
 /*
  * alc5632 2 wire address is determined by A1 pin
  * state during powerup.
  *    low  = 0x1a
  *    high = 0x1b
  */
-static int alc5632_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int alc5632_i2c_probe(struct i2c_client *client)
 {
        struct alc5632_priv *alc5632;
        int ret, ret1, ret2;
        unsigned int vid1, vid2;
+       const struct i2c_device_id *id;
 
        alc5632 = devm_kzalloc(&client->dev,
                         sizeof(struct alc5632_priv), GFP_KERNEL);
@@ -1129,6 +1135,8 @@ static int alc5632_i2c_probe(struct i2c_client *client,
 
        vid2 >>= 8;
 
+       id = i2c_match_id(alc5632_i2c_table, client);
+
        if ((vid1 != 0x10EC) || (vid2 != id->driver_data)) {
                dev_err(&client->dev,
                "Device is not a ALC5632: VID1=0x%x, VID2=0x%x\n", vid1, vid2);
@@ -1161,12 +1169,6 @@ static int alc5632_i2c_probe(struct i2c_client *client,
        return ret;
 }
 
-static const struct i2c_device_id alc5632_i2c_table[] = {
-       {"alc5632", 0x5c},
-       {}
-};
-MODULE_DEVICE_TABLE(i2c, alc5632_i2c_table);
-
 #ifdef CONFIG_OF
 static const struct of_device_id alc5632_of_match[] = {
        { .compatible = "realtek,alc5632", },
@@ -1181,7 +1183,7 @@ static struct i2c_driver alc5632_i2c_driver = {
                .name = "alc5632",
                .of_match_table = of_match_ptr(alc5632_of_match),
        },
-       .probe = alc5632_i2c_probe,
+       .probe_new = alc5632_i2c_probe,
        .id_table = alc5632_i2c_table,
 };