ASoC: cs*: 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>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Lucas Tanure <tanureal@opensource.cirrus.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220325170734.1216018-1-steve@sk2.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c
index 933e3d6..badfc55 100644 (file)
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
@@ -346,8 +346,7 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client,
        return 0;
 }
 
-static int cs35l32_i2c_probe(struct i2c_client *i2c_client,
-                                      const struct i2c_device_id *id)
+static int cs35l32_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs35l32_private *cs35l32;
        struct cs35l32_platform_data *pdata =
@@ -576,7 +575,7 @@ static struct i2c_driver cs35l32_i2c_driver = {
                   .of_match_table = cs35l32_of_match,
                   },
        .id_table = cs35l32_id,
-       .probe = cs35l32_i2c_probe,
+       .probe_new = cs35l32_i2c_probe,
        .remove = cs35l32_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c
index 2a6f5e4..47dc0f6 100644 (file)
--- a/sound/soc/codecs/cs35l33.c
+++ b/sound/soc/codecs/cs35l33.c
@@ -1116,8 +1116,7 @@ static int cs35l33_of_get_pdata(struct device *dev,
        return 0;
 }
 
-static int cs35l33_i2c_probe(struct i2c_client *i2c_client,
-                                      const struct i2c_device_id *id)
+static int cs35l33_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs35l33_private *cs35l33;
        struct cs35l33_pdata *pdata = dev_get_platdata(&i2c_client->dev);
@@ -1286,7 +1285,7 @@ static struct i2c_driver cs35l33_i2c_driver = {
 
                },
        .id_table = cs35l33_id,
-       .probe = cs35l33_i2c_probe,
+       .probe_new = cs35l33_i2c_probe,
        .remove = cs35l33_i2c_remove,
 
 };

diff --git a/sound/soc/codecs/cs35l34.c b/sound/soc/codecs/cs35l34.c
index ed67824..50d509a 100644 (file)
--- a/sound/soc/codecs/cs35l34.c
+++ b/sound/soc/codecs/cs35l34.c
@@ -994,8 +994,7 @@ static const char * const cs35l34_core_supplies[] = {
        "VP",
 };
 
-static int cs35l34_i2c_probe(struct i2c_client *i2c_client,
-                             const struct i2c_device_id *id)
+static int cs35l34_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs35l34_private *cs35l34;
        struct cs35l34_platform_data *pdata =
@@ -1217,7 +1216,7 @@ static struct i2c_driver cs35l34_i2c_driver = {
 
                },
        .id_table = cs35l34_id,
-       .probe = cs35l34_i2c_probe,
+       .probe_new = cs35l34_i2c_probe,
        .remove = cs35l34_i2c_remove,
 
 };

diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c
index 961a3e0..6b70afb 100644 (file)
--- a/sound/soc/codecs/cs35l35.c
+++ b/sound/soc/codecs/cs35l35.c
@@ -1466,8 +1466,7 @@ static const struct reg_sequence cs35l35_errata_patch[] = {
        { 0x7F, 0x00 },
 };
 
-static int cs35l35_i2c_probe(struct i2c_client *i2c_client,
-                             const struct i2c_device_id *id)
+static int cs35l35_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs35l35_private *cs35l35;
        struct device *dev = &i2c_client->dev;
@@ -1658,7 +1657,7 @@ static struct i2c_driver cs35l35_i2c_driver = {
                .of_match_table = cs35l35_of_match,
        },
        .id_table = cs35l35_id,
-       .probe = cs35l35_i2c_probe,
+       .probe_new = cs35l35_i2c_probe,
        .remove = cs35l35_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs35l36.c b/sound/soc/codecs/cs35l36.c
index d83c1b3..cc5e802 100644 (file)
--- a/sound/soc/codecs/cs35l36.c
+++ b/sound/soc/codecs/cs35l36.c
@@ -1700,8 +1700,7 @@ static const struct reg_sequence cs35l36_revb0_errata_patch[] = {
        { CS35L36_TESTKEY_CTRL, CS35L36_TEST_LOCK2 },
 };
 
-static int cs35l36_i2c_probe(struct i2c_client *i2c_client,
-                             const struct i2c_device_id *id)
+static int cs35l36_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs35l36_private *cs35l36;
        struct device *dev = &i2c_client->dev;
@@ -1947,7 +1946,7 @@ static struct i2c_driver cs35l36_i2c_driver = {
                .of_match_table = cs35l36_of_match,
        },
        .id_table = cs35l36_id,
-       .probe = cs35l36_i2c_probe,
+       .probe_new = cs35l36_i2c_probe,
        .remove = cs35l36_i2c_remove,
 };
 module_i2c_driver(cs35l36_i2c_driver);

diff --git a/sound/soc/codecs/cs35l41-i2c.c b/sound/soc/codecs/cs35l41-i2c.c
index faad5c6..86d866a 100644 (file)
--- a/sound/soc/codecs/cs35l41-i2c.c
+++ b/sound/soc/codecs/cs35l41-i2c.c
@@ -29,8 +29,7 @@ static const struct i2c_device_id cs35l41_id_i2c[] = {
 
 MODULE_DEVICE_TABLE(i2c, cs35l41_id_i2c);
 
-static int cs35l41_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int cs35l41_i2c_probe(struct i2c_client *client)
 {
        struct cs35l41_private *cs35l41;
        struct device *dev = &client->dev;
@@ -91,7 +90,7 @@ static struct i2c_driver cs35l41_i2c_driver = {
                .acpi_match_table = ACPI_PTR(cs35l41_acpi_match),
        },
        .id_table       = cs35l41_id_i2c,
-       .probe          = cs35l41_i2c_probe,
+       .probe_new      = cs35l41_i2c_probe,
        .remove         = cs35l41_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs4234.c b/sound/soc/codecs/cs4234.c
index 20126cc..b449391 100644 (file)
--- a/sound/soc/codecs/cs4234.c
+++ b/sound/soc/codecs/cs4234.c
@@ -731,7 +731,7 @@ static int cs4234_powerup(struct cs4234 *cs4234)
        return 0;
 }
 
-static int cs4234_i2c_probe(struct i2c_client *i2c_client, const struct i2c_device_id *id)
+static int cs4234_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs4234 *cs4234;
        struct device *dev = &i2c_client->dev;
@@ -908,7 +908,7 @@ static struct i2c_driver cs4234_i2c_driver = {
                .pm = &cs4234_pm,
                .of_match_table = cs4234_of_match,
        },
-       .probe =        cs4234_i2c_probe,
+       .probe_new =    cs4234_i2c_probe,
        .remove =       cs4234_i2c_remove,
 };
 module_i2c_driver(cs4234_i2c_driver);

diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c
index 4415fb3..86bfa8d 100644 (file)
--- a/sound/soc/codecs/cs4265.c
+++ b/sound/soc/codecs/cs4265.c
@@ -568,8 +568,7 @@ static const struct regmap_config cs4265_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int cs4265_i2c_probe(struct i2c_client *i2c_client,
-                            const struct i2c_device_id *id)
+static int cs4265_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs4265_private *cs4265;
        int ret;
@@ -653,7 +652,7 @@ static struct i2c_driver cs4265_i2c_driver = {
                .of_match_table = cs4265_of_match,
        },
        .id_table = cs4265_id,
-       .probe =    cs4265_i2c_probe,
+       .probe_new = cs4265_i2c_probe,
        .remove =   cs4265_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 2d239e9..07cac01 100644 (file)
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -677,8 +677,7 @@ static int cs4270_i2c_remove(struct i2c_client *i2c_client)
  * This function is called whenever the I2C subsystem finds a device that
  * matches the device ID given via a prior call to i2c_add_driver().
  */
-static int cs4270_i2c_probe(struct i2c_client *i2c_client,
-       const struct i2c_device_id *id)
+static int cs4270_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs4270_private *cs4270;
        unsigned int val;
@@ -765,7 +764,7 @@ static struct i2c_driver cs4270_i2c_driver = {
                .of_match_table = cs4270_of_match,
        },
        .id_table = cs4270_id,
-       .probe = cs4270_i2c_probe,
+       .probe_new = cs4270_i2c_probe,
        .remove = cs4270_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs4271-i2c.c b/sound/soc/codecs/cs4271-i2c.c
index 0a17423..0e8a7cf 100644 (file)
--- a/sound/soc/codecs/cs4271-i2c.c
+++ b/sound/soc/codecs/cs4271-i2c.c
@@ -11,8 +11,7 @@
 #include <sound/soc.h>
 #include "cs4271.h"
 
-static int cs4271_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int cs4271_i2c_probe(struct i2c_client *client)
 {
        struct regmap_config config;
 
@@ -35,7 +34,7 @@ static struct i2c_driver cs4271_i2c_driver = {
                .name = "cs4271",
                .of_match_table = of_match_ptr(cs4271_dt_ids),
        },
-       .probe = cs4271_i2c_probe,
+       .probe_new = cs4271_i2c_probe,
        .id_table = cs4271_i2c_id,
 };
 module_i2c_driver(cs4271_i2c_driver);

diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index c8409d5..4fade23 100644 (file)
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -2194,8 +2194,7 @@ static int __maybe_unused cs42l42_resume(struct device *dev)
        return 0;
 }
 
-static int cs42l42_i2c_probe(struct i2c_client *i2c_client,
-                                      const struct i2c_device_id *id)
+static int cs42l42_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs42l42_private *cs42l42;
        int ret, i, devid;
@@ -2399,7 +2398,7 @@ static struct i2c_driver cs42l42_i2c_driver = {
                .acpi_match_table = ACPI_PTR(cs42l42_acpi_match),
                },
        .id_table = cs42l42_id,
-       .probe = cs42l42_i2c_probe,
+       .probe_new = cs42l42_i2c_probe,
        .remove = cs42l42_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs42l51-i2c.c b/sound/soc/codecs/cs42l51-i2c.c
index 3cb21a2..3613fb1 100644 (file)
--- a/sound/soc/codecs/cs42l51-i2c.c
+++ b/sound/soc/codecs/cs42l51-i2c.c
@@ -19,8 +19,7 @@ static struct i2c_device_id cs42l51_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, cs42l51_i2c_id);
 
-static int cs42l51_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int cs42l51_i2c_probe(struct i2c_client *i2c)
 {
        struct regmap_config config;
 
@@ -46,7 +45,7 @@ static struct i2c_driver cs42l51_i2c_driver = {
                .of_match_table = cs42l51_of_match,
                .pm = &cs42l51_pm_ops,
        },
-       .probe = cs42l51_i2c_probe,
+       .probe_new = cs42l51_i2c_probe,
        .remove = cs42l51_i2c_remove,
        .id_table = cs42l51_i2c_id,
 };

diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 8016115..9b182b5 100644 (file)
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -1086,8 +1086,7 @@ static const struct regmap_config cs42l52_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int cs42l52_i2c_probe(struct i2c_client *i2c_client,
-                            const struct i2c_device_id *id)
+static int cs42l52_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs42l52_private *cs42l52;
        struct cs42l52_platform_data *pdata = dev_get_platdata(&i2c_client->dev);
@@ -1226,7 +1225,7 @@ static struct i2c_driver cs42l52_i2c_driver = {
                .of_match_table = cs42l52_of_match,
        },
        .id_table = cs42l52_id,
-       .probe =    cs42l52_i2c_probe,
+       .probe_new = cs42l52_i2c_probe,
 };
 
 module_i2c_driver(cs42l52_i2c_driver);

diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c
index 3cf8a0b..2c4e09b 100644 (file)
--- a/sound/soc/codecs/cs42l56.c
+++ b/sound/soc/codecs/cs42l56.c
@@ -1167,8 +1167,7 @@ static int cs42l56_handle_of_data(struct i2c_client *i2c_client,
        return 0;
 }
 
-static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
-                            const struct i2c_device_id *id)
+static int cs42l56_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs42l56_private *cs42l56;
        struct cs42l56_platform_data *pdata =
@@ -1350,7 +1349,7 @@ static struct i2c_driver cs42l56_i2c_driver = {
                .of_match_table = cs42l56_of_match,
        },
        .id_table = cs42l56_id,
-       .probe =    cs42l56_i2c_probe,
+       .probe_new = cs42l56_i2c_probe,
        .remove =   cs42l56_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 018463f..5a91662 100644 (file)
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1274,8 +1274,7 @@ static const struct regmap_config cs42l73_regmap = {
        .use_single_write = true,
 };
 
-static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
-                            const struct i2c_device_id *id)
+static int cs42l73_i2c_probe(struct i2c_client *i2c_client)
 {
        struct cs42l73_private *cs42l73;
        struct cs42l73_platform_data *pdata = dev_get_platdata(&i2c_client->dev);
@@ -1386,7 +1385,7 @@ static struct i2c_driver cs42l73_i2c_driver = {
                   .of_match_table = cs42l73_of_match,
                   },
        .id_table = cs42l73_id,
-       .probe = cs42l73_i2c_probe,
+       .probe_new = cs42l73_i2c_probe,
 
 };
 

diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c
index 0214e3a..cb06a06 100644 (file)
--- a/sound/soc/codecs/cs42xx8-i2c.c
+++ b/sound/soc/codecs/cs42xx8-i2c.c
@@ -17,8 +17,7 @@
 
 #include "cs42xx8.h"
 
-static int cs42xx8_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int cs42xx8_i2c_probe(struct i2c_client *i2c)
 {
        int ret = cs42xx8_probe(&i2c->dev,
                        devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config));
@@ -51,7 +50,7 @@ static struct i2c_driver cs42xx8_i2c_driver = {
                .pm = &cs42xx8_pm,
                .of_match_table = cs42xx8_of_match,
        },
-       .probe = cs42xx8_i2c_probe,
+       .probe_new = cs42xx8_i2c_probe,
        .remove = cs42xx8_i2c_remove,
        .id_table = cs42xx8_i2c_id,
 };

diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c
index 44b20c1..e38552a 100644 (file)
--- a/sound/soc/codecs/cs43130.c
+++ b/sound/soc/codecs/cs43130.c
@@ -2418,8 +2418,7 @@ static int cs43130_handle_device_data(struct i2c_client *i2c_client,
        return 0;
 }
 
-static int cs43130_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int cs43130_i2c_probe(struct i2c_client *client)
 {
        struct cs43130_private *cs43130;
        int ret;
@@ -2702,7 +2701,7 @@ static struct i2c_driver cs43130_i2c_driver = {
                .pm             = &cs43130_runtime_pm,
        },
        .id_table       = cs43130_i2c_id,
-       .probe          = cs43130_i2c_probe,
+       .probe_new      = cs43130_i2c_probe,
        .remove         = cs43130_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs4341.c b/sound/soc/codecs/cs4341.c
index 29d05e3..8ac043f 100644 (file)
--- a/sound/soc/codecs/cs4341.c
+++ b/sound/soc/codecs/cs4341.c
@@ -225,8 +225,7 @@ static int cs4341_probe(struct device *dev)
 }
 
 #if IS_ENABLED(CONFIG_I2C)
-static int cs4341_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int cs4341_i2c_probe(struct i2c_client *i2c)
 {
        struct cs4341_priv *cs4341;
 
@@ -260,7 +259,7 @@ static struct i2c_driver cs4341_i2c_driver = {
                .name = "cs4341-i2c",
                .of_match_table = of_match_ptr(cs4341_dt_ids),
        },
-       .probe = cs4341_i2c_probe,
+       .probe_new = cs4341_i2c_probe,
        .id_table = cs4341_i2c_id,
 };
 #endif

diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index 786c69a..4ec4bed 100644 (file)
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -278,8 +278,7 @@ static const struct regmap_config cs4349_regmap = {
        .cache_type             = REGCACHE_RBTREE,
 };
 
-static int cs4349_i2c_probe(struct i2c_client *client,
-                                     const struct i2c_device_id *id)
+static int cs4349_i2c_probe(struct i2c_client *client)
 {
        struct cs4349_private *cs4349;
        int ret;
@@ -382,7 +381,7 @@ static struct i2c_driver cs4349_i2c_driver = {
                .pm = &cs4349_runtime_pm,
        },
        .id_table       = cs4349_i2c_id,
-       .probe          = cs4349_i2c_probe,
+       .probe_new      = cs4349_i2c_probe,
        .remove         = cs4349_i2c_remove,
 };
 

diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index f2087bd..7035452 100644 (file)
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -918,8 +918,7 @@ static struct regmap_config cs53l30_regmap = {
        .use_single_write = true,
 };
 
-static int cs53l30_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int cs53l30_i2c_probe(struct i2c_client *client)
 {
        const struct device_node *np = client->dev.of_node;
        struct device *dev = &client->dev;
@@ -1125,7 +1124,7 @@ static struct i2c_driver cs53l30_i2c_driver = {
                .pm = &cs53l30_runtime_pm,
        },
        .id_table = cs53l30_id,
-       .probe = cs53l30_i2c_probe,
+       .probe_new = cs53l30_i2c_probe,
        .remove = cs53l30_i2c_remove,
 };