ASoC: sta*: use simple i2c probe function

The i2c probe functions here don't use the id information provided in
their second argument, so the single-parameter i2c probe function
("probe_new") can be used instead.

This avoids scanning the identifier tables during probes.

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

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 86528b9..0ba6eab 100644 (file)
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -1094,8 +1094,7 @@ static int sta32x_probe_dt(struct device *dev, struct sta32x_priv *sta32x)
 }
 #endif
 
-static int sta32x_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int sta32x_i2c_probe(struct i2c_client *i2c)
 {
        struct device *dev = &i2c->dev;
        struct sta32x_priv *sta32x;
@@ -1175,7 +1174,7 @@ static struct i2c_driver sta32x_i2c_driver = {
                .name = "sta32x",
                .of_match_table = of_match_ptr(st32x_dt_ids),
        },
-       .probe =    sta32x_i2c_probe,
+       .probe_new = sta32x_i2c_probe,
        .id_table = sta32x_i2c_id,
 };
 

diff --git a/sound/soc/codecs/sta350.c b/sound/soc/codecs/sta350.c
index 75d3b06..1fb370f 100644 (file)
--- a/sound/soc/codecs/sta350.c
+++ b/sound/soc/codecs/sta350.c
@@ -1187,8 +1187,7 @@ static int sta350_probe_dt(struct device *dev, struct sta350_priv *sta350)
 }
 #endif
 
-static int sta350_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int sta350_i2c_probe(struct i2c_client *i2c)
 {
        struct device *dev = &i2c->dev;
        struct sta350_priv *sta350;
@@ -1263,7 +1262,7 @@ static struct i2c_driver sta350_i2c_driver = {
                .name = "sta350",
                .of_match_table = of_match_ptr(st350_dt_ids),
        },
-       .probe =    sta350_i2c_probe,
+       .probe_new = sta350_i2c_probe,
        .remove =   sta350_i2c_remove,
        .id_table = sta350_i2c_id,
 };

diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index 97b5f34..d90e551 100644 (file)
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -337,8 +337,7 @@ static const struct regmap_config sta529_regmap = {
        .num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults),
 };
 
-static int sta529_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int sta529_i2c_probe(struct i2c_client *i2c)
 {
        struct sta529 *sta529;
        int ret;
@@ -381,7 +380,7 @@ static struct i2c_driver sta529_i2c_driver = {
                .name = "sta529",
                .of_match_table = sta529_of_match,
        },
-       .probe          = sta529_i2c_probe,
+       .probe_new      = sta529_i2c_probe,
        .id_table       = sta529_i2c_id,
 };