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

diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c
index 39dda1b03b3dc9f8703a81913b33c714fb36f7db..d711eb1da0a882a0daf9d5cb386acbee8b1fc76e 100644 (file)
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@ -167,8 +167,7 @@ static const struct regmap_config max9768_i2c_regmap_config = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int max9768_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int max9768_i2c_probe(struct i2c_client *client)
 {
        struct max9768 *max9768;
        struct max9768_pdata *pdata = client->dev.platform_data;
@@ -215,7 +214,7 @@ static struct i2c_driver max9768_i2c_driver = {
        .driver = {
                .name = "max9768",
        },
-       .probe = max9768_i2c_probe,
+       .probe_new = max9768_i2c_probe,
        .id_table = max9768_i2c_id,
 };
 module_i2c_driver(max9768_i2c_driver);

diff --git a/sound/soc/codecs/max98371.c b/sound/soc/codecs/max98371.c
index 8d42f523e4204db7609d679bd3a85c5e685532a4..800f2bca6a0f1226a5e498695662a090255f53df 100644 (file)
--- a/sound/soc/codecs/max98371.c
+++ b/sound/soc/codecs/max98371.c
@@ -365,8 +365,7 @@ static const struct regmap_config max98371_regmap = {
        .cache_type       = REGCACHE_RBTREE,
 };
 
-static int max98371_i2c_probe(struct i2c_client *i2c,
-               const struct i2c_device_id *id)
+static int max98371_i2c_probe(struct i2c_client *i2c)
 {
        struct max98371_priv *max98371;
        int ret, reg;
@@ -421,7 +420,7 @@ static struct i2c_driver max98371_i2c_driver = {
                .name = "max98371",
                .of_match_table = of_match_ptr(max98371_of_match),
        },
-       .probe  = max98371_i2c_probe,
+       .probe_new  = max98371_i2c_probe,
        .id_table = max98371_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max98373-i2c.c b/sound/soc/codecs/max98373-i2c.c
index ddb6436835d737b14cbc451313af64c12bc57bf9..4fe065ece17cb3e0655a25dcae154aa9dd69c6af 100644 (file)
--- a/sound/soc/codecs/max98373-i2c.c
+++ b/sound/soc/codecs/max98373-i2c.c
@@ -516,8 +516,7 @@ static const struct regmap_config max98373_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int max98373_i2c_probe(struct i2c_client *i2c,
-                             const struct i2c_device_id *id)
+static int max98373_i2c_probe(struct i2c_client *i2c)
 {
        int ret = 0;
        int reg = 0;
@@ -622,7 +621,7 @@ static struct i2c_driver max98373_i2c_driver = {
                .acpi_match_table = ACPI_PTR(max98373_acpi_match),
                .pm = &max98373_pm,
        },
-       .probe = max98373_i2c_probe,
+       .probe_new = max98373_i2c_probe,
        .id_table = max98373_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c
index 40fd6f363f35687552b21ac67eced7e9b687c0f2..d1fed8e2bded1c5404d18577222f3bad5a0cf572 100644 (file)
--- a/sound/soc/codecs/max98390.c
+++ b/sound/soc/codecs/max98390.c
@@ -1014,8 +1014,7 @@ static void max98390_slot_config(struct i2c_client *i2c,
                max98390->i_l_slot = 1;
 }
 
-static int max98390_i2c_probe(struct i2c_client *i2c,
-               const struct i2c_device_id *id)
+static int max98390_i2c_probe(struct i2c_client *i2c)
 {
        int ret = 0;
        int reg = 0;
@@ -1121,7 +1120,7 @@ static struct i2c_driver max98390_i2c_driver = {
                .acpi_match_table = ACPI_PTR(max98390_acpi_match),
                .pm = &max98390_pm,
        },
-       .probe = max98390_i2c_probe,
+       .probe_new = max98390_i2c_probe,
        .id_table = max98390_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c
index e073f0e029bec58a82ab1d7eb3b73e41484b8f52..9ca6fc254883c96ca996d814ae8f5e31c203e2a6 100644 (file)
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -299,8 +299,7 @@ static const struct snd_soc_component_driver soc_component_dev_max9850 = {
        .non_legacy_dai_naming  = 1,
 };
 
-static int max9850_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int max9850_i2c_probe(struct i2c_client *i2c)
 {
        struct max9850_priv *max9850;
        int ret;
@@ -331,7 +330,7 @@ static struct i2c_driver max9850_i2c_driver = {
        .driver = {
                .name = "max9850",
        },
-       .probe = max9850_i2c_probe,
+       .probe_new = max9850_i2c_probe,
        .id_table = max9850_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max98504.c b/sound/soc/codecs/max98504.c
index a5aa124c4a2e405f61702e243386bb9e8dc1ac76..9da7381472e3bd91abc9eadf3588d1a23555a481 100644 (file)
--- a/sound/soc/codecs/max98504.c
+++ b/sound/soc/codecs/max98504.c
@@ -304,8 +304,7 @@ static const struct regmap_config max98504_regmap = {
        .cache_type             = REGCACHE_RBTREE,
 };
 
-static int max98504_i2c_probe(struct i2c_client *client,
-                             const struct i2c_device_id *id)
+static int max98504_i2c_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct device_node *node = dev->of_node;
@@ -371,7 +370,7 @@ static struct i2c_driver max98504_i2c_driver = {
                .name = "max98504",
                .of_match_table = of_match_ptr(max98504_of_match),
        },
-       .probe = max98504_i2c_probe,
+       .probe_new = max98504_i2c_probe,
        .id_table = max98504_i2c_id,
 };
 module_i2c_driver(max98504_i2c_driver);

diff --git a/sound/soc/codecs/max98520.c b/sound/soc/codecs/max98520.c
index bb8649cd421c0ba0b82f3bb08e3b1b018287e338..f0f085ecab55073f0ae95c27182d88e90d7715ec 100644 (file)
--- a/sound/soc/codecs/max98520.c
+++ b/sound/soc/codecs/max98520.c
@@ -677,7 +677,7 @@ static void max98520_power_on(struct max98520_priv *max98520, bool poweron)
                gpiod_set_value_cansleep(max98520->reset_gpio, !poweron);
 }
 
-static int max98520_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
+static int max98520_i2c_probe(struct i2c_client *i2c)
 {
        int ret;
        int reg = 0;
@@ -757,7 +757,7 @@ static struct i2c_driver max98520_i2c_driver = {
                .of_match_table = of_match_ptr(max98520_of_match),
                .pm = &max98520_pm,
        },
-       .probe = max98520_i2c_probe,
+       .probe_new = max98520_i2c_probe,
        .id_table = max98520_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c
index c2b1151c75cc4a9f6c55c9cc73e98404a795f956..eb628b7e84f5591526b5ccfc7995154344fe576d 100644 (file)
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
@@ -613,8 +613,7 @@ static const struct regmap_config max9867_regmap = {
        .cache_type     = REGCACHE_RBTREE,
 };
 
-static int max9867_i2c_probe(struct i2c_client *i2c,
-               const struct i2c_device_id *id)
+static int max9867_i2c_probe(struct i2c_client *i2c)
 {
        struct max9867_priv *max9867;
        int ret, reg;
@@ -662,7 +661,7 @@ static struct i2c_driver max9867_i2c_driver = {
                .name = "max9867",
                .of_match_table = of_match_ptr(max9867_of_match),
        },
-       .probe  = max9867_i2c_probe,
+       .probe_new  = max9867_i2c_probe,
        .id_table = max9867_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c
index 71fede9224c4fbf18f122f7f1a2e51353833359e..3bf86328d5cd01e1833bb51408ad6e490a722e76 100644 (file)
--- a/sound/soc/codecs/max9877.c
+++ b/sound/soc/codecs/max9877.c
@@ -133,8 +133,7 @@ static const struct regmap_config max9877_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int max9877_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int max9877_i2c_probe(struct i2c_client *client)
 {
        struct regmap *regmap;
        int i;
@@ -161,7 +160,7 @@ static struct i2c_driver max9877_i2c_driver = {
        .driver = {
                .name = "max9877",
        },
-       .probe = max9877_i2c_probe,
+       .probe_new = max9877_i2c_probe,
        .id_table = max9877_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c
index f34fa274ae4f20e7467418f482280a2bb4b3494b..63849ebcfd354e9cee999fae95f9a41a842acdb3 100644 (file)
--- a/sound/soc/codecs/max98925.c
+++ b/sound/soc/codecs/max98925.c
@@ -558,8 +558,7 @@ static const struct regmap_config max98925_regmap = {
        .cache_type       = REGCACHE_RBTREE,
 };
 
-static int max98925_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int max98925_i2c_probe(struct i2c_client *i2c)
 {
        int ret, reg;
        u32 value;
@@ -637,7 +636,7 @@ static struct i2c_driver max98925_i2c_driver = {
                .name = "max98925",
                .of_match_table = of_match_ptr(max98925_of_match),
        },
-       .probe  = max98925_i2c_probe,
+       .probe_new  = max98925_i2c_probe,
        .id_table = max98925_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c
index 1fbbc62bb0a268d700252211213365f0c840e9a5..56e0a87c7112f4443b4b12cde186bdb7132e02b3 100644 (file)
--- a/sound/soc/codecs/max98926.c
+++ b/sound/soc/codecs/max98926.c
@@ -510,8 +510,7 @@ static const struct regmap_config max98926_regmap = {
        .cache_type             = REGCACHE_RBTREE,
 };
 
-static int max98926_i2c_probe(struct i2c_client *i2c,
-               const struct i2c_device_id *id)
+static int max98926_i2c_probe(struct i2c_client *i2c)
 {
        int ret, reg;
        u32 value;
@@ -584,7 +583,7 @@ static struct i2c_driver max98926_i2c_driver = {
                .name = "max98926",
                .of_match_table = of_match_ptr(max98926_of_match),
        },
-       .probe  = max98926_i2c_probe,
+       .probe_new = max98926_i2c_probe,
        .id_table = max98926_i2c_id,
 };
 

diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index bf78d3c9851494ded4c4b21bede4aee6cddf6b34..b7cff76d7b5b9e9f0ab3c2d401ebe261ab6ef233 100644 (file)
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -863,8 +863,7 @@ static void max98927_slot_config(struct i2c_client *i2c,
                max98927->i_l_slot = 1;
 }
 
-static int max98927_i2c_probe(struct i2c_client *i2c,
-       const struct i2c_device_id *id)
+static int max98927_i2c_probe(struct i2c_client *i2c)
 {
 
        int ret = 0, value;
@@ -977,7 +976,7 @@ static struct i2c_driver max98927_i2c_driver = {
                .acpi_match_table = ACPI_PTR(max98927_acpi_match),
                .pm = &max98927_pm,
        },
-       .probe  = max98927_i2c_probe,
+       .probe_new = max98927_i2c_probe,
        .remove = max98927_i2c_remove,
        .id_table = max98927_i2c_id,
 };