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

diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index 9eb65f9..20eb04c 100644 (file)
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -299,8 +299,7 @@ static const struct i2c_device_id pcm1681_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, pcm1681_i2c_id);
 
-static int pcm1681_i2c_probe(struct i2c_client *client,
-                             const struct i2c_device_id *id)
+static int pcm1681_i2c_probe(struct i2c_client *client)
 {
        int ret;
        struct pcm1681_private *priv;
@@ -329,7 +328,7 @@ static struct i2c_driver pcm1681_i2c_driver = {
                .of_match_table = of_match_ptr(pcm1681_dt_ids),
        },
        .id_table       = pcm1681_i2c_id,
-       .probe          = pcm1681_i2c_probe,
+       .probe_new      = pcm1681_i2c_probe,
 };
 
 module_i2c_driver(pcm1681_i2c_driver);

diff --git a/sound/soc/codecs/pcm1789-i2c.c b/sound/soc/codecs/pcm1789-i2c.c
index 7a6be45..28e6ca2 100644 (file)
--- a/sound/soc/codecs/pcm1789-i2c.c
+++ b/sound/soc/codecs/pcm1789-i2c.c
@@ -12,8 +12,7 @@
 
 #include "pcm1789.h"
 
-static int pcm1789_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int pcm1789_i2c_probe(struct i2c_client *client)
 {
        struct regmap *regmap;
        int ret;
@@ -53,7 +52,7 @@ static struct i2c_driver pcm1789_i2c_driver = {
                .of_match_table = of_match_ptr(pcm1789_of_match),
        },
        .id_table       = pcm1789_i2c_ids,
-       .probe          = pcm1789_i2c_probe,
+       .probe_new      = pcm1789_i2c_probe,
        .remove = pcm1789_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/pcm179x-i2c.c b/sound/soc/codecs/pcm179x-i2c.c
index 34a3d59..e20fe3a 100644 (file)
--- a/sound/soc/codecs/pcm179x-i2c.c
+++ b/sound/soc/codecs/pcm179x-i2c.c
@@ -14,8 +14,7 @@
 
 #include "pcm179x.h"
 
-static int pcm179x_i2c_probe(struct i2c_client *client,
-                             const struct i2c_device_id *id)
+static int pcm179x_i2c_probe(struct i2c_client *client)
 {
        struct regmap *regmap;
        int ret;
@@ -50,7 +49,7 @@ static struct i2c_driver pcm179x_i2c_driver = {
                .of_match_table = of_match_ptr(pcm179x_of_match),
        },
        .id_table       = pcm179x_i2c_ids,
-       .probe          = pcm179x_i2c_probe,
+       .probe_new      = pcm179x_i2c_probe,
 };
 
 module_i2c_driver(pcm179x_i2c_driver);

diff --git a/sound/soc/codecs/pcm3168a-i2c.c b/sound/soc/codecs/pcm3168a-i2c.c
index 1f75933..c0fa0dc 100644 (file)
--- a/sound/soc/codecs/pcm3168a-i2c.c
+++ b/sound/soc/codecs/pcm3168a-i2c.c
@@ -15,8 +15,7 @@
 
 #include "pcm3168a.h"
 
-static int pcm3168a_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int pcm3168a_i2c_probe(struct i2c_client *i2c)
 {
        struct regmap *regmap;
 
@@ -47,7 +46,7 @@ static const struct of_device_id pcm3168a_of_match[] = {
 MODULE_DEVICE_TABLE(of, pcm3168a_of_match);
 
 static struct i2c_driver pcm3168a_i2c_driver = {
-       .probe          = pcm3168a_i2c_probe,
+       .probe_new      = pcm3168a_i2c_probe,
        .remove         = pcm3168a_i2c_remove,
        .id_table       = pcm3168a_i2c_id,
        .driver         = {

diff --git a/sound/soc/codecs/pcm512x-i2c.c b/sound/soc/codecs/pcm512x-i2c.c
index 633f7eb..81754e1 100644 (file)
--- a/sound/soc/codecs/pcm512x-i2c.c
+++ b/sound/soc/codecs/pcm512x-i2c.c
@@ -13,8 +13,7 @@
 
 #include "pcm512x.h"
 
-static int pcm512x_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int pcm512x_i2c_probe(struct i2c_client *i2c)
 {
        struct regmap *regmap;
        struct regmap_config config = pcm512x_regmap;
@@ -68,7 +67,7 @@ MODULE_DEVICE_TABLE(acpi, pcm512x_acpi_match);
 #endif
 
 static struct i2c_driver pcm512x_i2c_driver = {
-       .probe          = pcm512x_i2c_probe,
+       .probe_new      = pcm512x_i2c_probe,
        .remove         = pcm512x_i2c_remove,
        .id_table       = pcm512x_i2c_id,
        .driver         = {