ASoC: tas*: 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-11-steve@sk2.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c
index 700baa6314aa89997d15a5d718d31cbbe47f9df1..b5c9c61ff5a8e4cbb35f12899fe9aeb1689b5dd3 100644 (file)
--- a/sound/soc/codecs/tas2552.c
+++ b/sound/soc/codecs/tas2552.c
@@ -681,8 +681,7 @@ static const struct regmap_config tas2552_regmap_config = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int tas2552_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static int tas2552_probe(struct i2c_client *client)
 {
        struct device *dev;
        struct tas2552_data *data;
@@ -764,7 +763,7 @@ static struct i2c_driver tas2552_i2c_driver = {
                .of_match_table = of_match_ptr(tas2552_of_match),
                .pm = &tas2552_pm,
        },
-       .probe = tas2552_probe,
+       .probe_new = tas2552_probe,
        .remove = tas2552_i2c_remove,
        .id_table = tas2552_id,
 };

diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c
index 9265af41c235dbcc46158e46363825c128462a24..d395feffb30b58014737466f134af4fae40deac3 100644 (file)
--- a/sound/soc/codecs/tas2764.c
+++ b/sound/soc/codecs/tas2764.c
@@ -621,8 +621,7 @@ static int tas2764_parse_dt(struct device *dev, struct tas2764_priv *tas2764)
        return 0;
 }
 
-static int tas2764_i2c_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int tas2764_i2c_probe(struct i2c_client *client)
 {
        struct tas2764_priv *tas2764;
        int result;
@@ -678,7 +677,7 @@ static struct i2c_driver tas2764_i2c_driver = {
                .name   = "tas2764",
                .of_match_table = of_match_ptr(tas2764_of_match),
        },
-       .probe      = tas2764_i2c_probe,
+       .probe_new  = tas2764_i2c_probe,
        .id_table   = tas2764_i2c_id,
 };
 module_i2c_driver(tas2764_i2c_driver);

diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c
index c5ea3b115966b81314f4bba2e9c06694ff457c2b..c1dbd978d550230d483740d42a6f1270c632e672 100644 (file)
--- a/sound/soc/codecs/tas2770.c
+++ b/sound/soc/codecs/tas2770.c
@@ -672,8 +672,7 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770)
        return 0;
 }
 
-static int tas2770_i2c_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int tas2770_i2c_probe(struct i2c_client *client)
 {
        struct tas2770_priv *tas2770;
        int result;
@@ -739,7 +738,7 @@ static struct i2c_driver tas2770_i2c_driver = {
                .name   = "tas2770",
                .of_match_table = of_match_ptr(tas2770_of_match),
        },
-       .probe      = tas2770_i2c_probe,
+       .probe_new  = tas2770_i2c_probe,
        .id_table   = tas2770_i2c_id,
 };
 module_i2c_driver(tas2770_i2c_driver);

diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index 7831c96d0d83c76e8ee8e0a55a4efeeef716679c..5c0df3cd48320deb56a2272fec5aa4e8367af301 100644 (file)
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -911,8 +911,7 @@ static const struct regmap_config tas5086_regmap = {
        .reg_write              = tas5086_reg_write,
 };
 
-static int tas5086_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int tas5086_i2c_probe(struct i2c_client *i2c)
 {
        struct tas5086_private *priv;
        struct device *dev = &i2c->dev;
@@ -994,7 +993,7 @@ static struct i2c_driver tas5086_i2c_driver = {
                .of_match_table = of_match_ptr(tas5086_dt_ids),
        },
        .id_table       = tas5086_i2c_id,
-       .probe          = tas5086_i2c_probe,
+       .probe_new      = tas5086_i2c_probe,
        .remove         = tas5086_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c
index 59543d392110a0201cbf3379f5bac123d1e046ad..f06d2ad613f8d44e139ce02e334d5d836f42ac40 100644 (file)
--- a/sound/soc/codecs/tas6424.c
+++ b/sound/soc/codecs/tas6424.c
@@ -682,8 +682,7 @@ static const struct of_device_id tas6424_of_ids[] = {
 MODULE_DEVICE_TABLE(of, tas6424_of_ids);
 #endif
 
-static int tas6424_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int tas6424_i2c_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct tas6424_data *tas6424;
@@ -805,7 +804,7 @@ static struct i2c_driver tas6424_i2c_driver = {
                .name = "tas6424",
                .of_match_table = of_match_ptr(tas6424_of_ids),
        },
-       .probe = tas6424_i2c_probe,
+       .probe_new = tas6424_i2c_probe,
        .remove = tas6424_i2c_remove,
        .id_table = tas6424_i2c_ids,
 };