ASoC: rt*: 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/20220405130326.2107293-1-steve@sk2.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c
index b62301a6281f912b3794f43f1aff10b10a11315b..08dbaef84d4e188d44a31711d3b334056d35c833 100644 (file)
--- a/sound/soc/codecs/rt1011.c
+++ b/sound/soc/codecs/rt1011.c
@@ -2433,8 +2433,7 @@ static int rt1011_parse_dp(struct rt1011_priv *rt1011, struct device *dev)
        return 0;
 }
 
-static int rt1011_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt1011_i2c_probe(struct i2c_client *i2c)
 {
        struct rt1011_priv *rt1011;
        int ret;
@@ -2485,7 +2484,7 @@ static struct i2c_driver rt1011_i2c_driver = {
                .of_match_table = of_match_ptr(rt1011_of_match),
                .acpi_match_table = ACPI_PTR(rt1011_acpi_match)
        },
-       .probe = rt1011_i2c_probe,
+       .probe_new = rt1011_i2c_probe,
        .shutdown = rt1011_i2c_shutdown,
        .id_table = rt1011_i2c_id,
 };

diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c
index 6a27dfacd81c8207426262faf4613b9088cf9a14..7a06f2654afb037f52d8760deb7f07ab92f30007 100644 (file)
--- a/sound/soc/codecs/rt1015.c
+++ b/sound/soc/codecs/rt1015.c
@@ -1113,8 +1113,7 @@ static void rt1015_parse_dt(struct rt1015_priv *rt1015, struct device *dev)
                &rt1015->pdata.power_up_delay_ms);
 }
 
-static int rt1015_i2c_probe(struct i2c_client *i2c,
-       const struct i2c_device_id *id)
+static int rt1015_i2c_probe(struct i2c_client *i2c)
 {
        struct rt1015_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt1015_priv *rt1015;
@@ -1172,7 +1171,7 @@ static struct i2c_driver rt1015_i2c_driver = {
                .of_match_table = of_match_ptr(rt1015_of_match),
                .acpi_match_table = ACPI_PTR(rt1015_acpi_match),
        },
-       .probe = rt1015_i2c_probe,
+       .probe_new = rt1015_i2c_probe,
        .shutdown = rt1015_i2c_shutdown,
        .id_table = rt1015_i2c_id,
 };

diff --git a/sound/soc/codecs/rt1016.c b/sound/soc/codecs/rt1016.c
index 9845cdddcb4c8c425d66b14dd863534e5a4c2fc0..e31c4736627f048e653b01f804c0a3b24fe28373 100644 (file)
--- a/sound/soc/codecs/rt1016.c
+++ b/sound/soc/codecs/rt1016.c
@@ -631,8 +631,7 @@ static const struct acpi_device_id rt1016_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rt1016_acpi_match);
 #endif
 
-static int rt1016_i2c_probe(struct i2c_client *i2c,
-       const struct i2c_device_id *id)
+static int rt1016_i2c_probe(struct i2c_client *i2c)
 {
        struct rt1016_priv *rt1016;
        int ret;
@@ -685,7 +684,7 @@ static struct i2c_driver rt1016_i2c_driver = {
                .of_match_table = of_match_ptr(rt1016_of_match),
                .acpi_match_table = ACPI_PTR(rt1016_acpi_match),
        },
-       .probe = rt1016_i2c_probe,
+       .probe_new = rt1016_i2c_probe,
        .shutdown = rt1016_i2c_shutdown,
        .id_table = rt1016_i2c_id,
 };

diff --git a/sound/soc/codecs/rt1019.c b/sound/soc/codecs/rt1019.c
index 80b7ca0e4e1e68fc6e9eaf25457b151e6690721b..d45d14fe5c4274fb92752cb65003b4a99e7b4610 100644 (file)
--- a/sound/soc/codecs/rt1019.c
+++ b/sound/soc/codecs/rt1019.c
@@ -558,8 +558,7 @@ static const struct acpi_device_id rt1019_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rt1019_acpi_match);
 #endif
 
-static int rt1019_i2c_probe(struct i2c_client *i2c,
-       const struct i2c_device_id *id)
+static int rt1019_i2c_probe(struct i2c_client *i2c)
 {
        struct rt1019_priv *rt1019;
        int ret;
@@ -599,7 +598,7 @@ static struct i2c_driver rt1019_i2c_driver = {
                .of_match_table = of_match_ptr(rt1019_of_match),
                .acpi_match_table = ACPI_PTR(rt1019_acpi_match),
        },
-       .probe = rt1019_i2c_probe,
+       .probe_new = rt1019_i2c_probe,
        .id_table = rt1019_i2c_id,
 };
 module_i2c_driver(rt1019_i2c_driver);

diff --git a/sound/soc/codecs/rt1305.c b/sound/soc/codecs/rt1305.c
index a9c473537a9159a829080b40315e73a465e08434..58d97e3c5087d4993e64dfe8241c0c9769fdade0 100644 (file)
--- a/sound/soc/codecs/rt1305.c
+++ b/sound/soc/codecs/rt1305.c
@@ -1117,8 +1117,7 @@ static void rt1305_calibrate(struct rt1305_priv *rt1305)
        regcache_cache_bypass(rt1305->regmap, false);
 }
 
-static int rt1305_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt1305_i2c_probe(struct i2c_client *i2c)
 {
        struct rt1305_priv *rt1305;
        int ret;
@@ -1172,7 +1171,7 @@ static struct i2c_driver rt1305_i2c_driver = {
                .acpi_match_table = ACPI_PTR(rt1305_acpi_match)
 #endif
        },
-       .probe = rt1305_i2c_probe,
+       .probe_new = rt1305_i2c_probe,
        .shutdown = rt1305_i2c_shutdown,
        .id_table = rt1305_i2c_id,
 };

diff --git a/sound/soc/codecs/rt1308.c b/sound/soc/codecs/rt1308.c
index c555b77b3c5cd2781c1b1965bd9455ef255d6141..eec2b1760408907702b391ee2e16cf4430d8fd4f 100644 (file)
--- a/sound/soc/codecs/rt1308.c
+++ b/sound/soc/codecs/rt1308.c
@@ -814,8 +814,7 @@ static void rt1308_efuse(struct rt1308_priv *rt1308)
        regmap_write(rt1308->regmap, RT1308_PVDD_OFFSET_CTL, 0x10000000);
 }
 
-static int rt1308_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt1308_i2c_probe(struct i2c_client *i2c)
 {
        struct rt1308_priv *rt1308;
        int ret;
@@ -864,7 +863,7 @@ static struct i2c_driver rt1308_i2c_driver = {
                .of_match_table = of_match_ptr(rt1308_of_match),
                .acpi_match_table = ACPI_PTR(rt1308_acpi_match),
        },
-       .probe = rt1308_i2c_probe,
+       .probe_new = rt1308_i2c_probe,
        .shutdown = rt1308_i2c_shutdown,
        .id_table = rt1308_i2c_id,
 };

diff --git a/sound/soc/codecs/rt274.c b/sound/soc/codecs/rt274.c
index 0d3773c576f8c91835d2c913ed2d3bc7286c26bd..ab093bdb55523e81a6f9b4dfb6313a35d4943d44 100644 (file)
--- a/sound/soc/codecs/rt274.c
+++ b/sound/soc/codecs/rt274.c
@@ -1114,8 +1114,7 @@ static const struct acpi_device_id rt274_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rt274_acpi_match);
 #endif
 
-static int rt274_i2c_probe(struct i2c_client *i2c,
-                          const struct i2c_device_id *id)
+static int rt274_i2c_probe(struct i2c_client *i2c)
 {
        struct rt274_priv *rt274;
 
@@ -1227,7 +1226,7 @@ static struct i2c_driver rt274_i2c_driver = {
                   .of_match_table = of_match_ptr(rt274_of_match),
 #endif
                   },
-       .probe = rt274_i2c_probe,
+       .probe_new = rt274_i2c_probe,
        .remove = rt274_i2c_remove,
        .id_table = rt274_i2c_id,
 };

diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index caa720884e3e7cc6e327a333947ecc5c1085793f..ad8ea1fa7c2322a4b97b978b2204984d0d07804f 100644 (file)
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -1134,8 +1134,7 @@ static const struct dmi_system_id dmi_dell[] = {
        { }
 };
 
-static int rt286_i2c_probe(struct i2c_client *i2c,
-                          const struct i2c_device_id *id)
+static int rt286_i2c_probe(struct i2c_client *i2c)
 {
        struct rt286_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt286_priv *rt286;
@@ -1271,7 +1270,7 @@ static struct i2c_driver rt286_i2c_driver = {
                   .name = "rt286",
                   .acpi_match_table = ACPI_PTR(rt286_acpi_match),
                   },
-       .probe = rt286_i2c_probe,
+       .probe_new = rt286_i2c_probe,
        .remove = rt286_i2c_remove,
        .id_table = rt286_i2c_id,
 };

diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c
index c592c40a7ab35decf97e45d76dd718e044e81162..c291786dc82def3e777841b7f11aaff977f2ba37 100644 (file)
--- a/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
@@ -1176,8 +1176,7 @@ static const struct dmi_system_id force_combo_jack_table[] = {
        { }
 };
 
-static int rt298_i2c_probe(struct i2c_client *i2c,
-                          const struct i2c_device_id *id)
+static int rt298_i2c_probe(struct i2c_client *i2c)
 {
        struct rt298_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt298_priv *rt298;
@@ -1314,7 +1313,7 @@ static struct i2c_driver rt298_i2c_driver = {
                   .name = "rt298",
                   .acpi_match_table = ACPI_PTR(rt298_acpi_match),
                   },
-       .probe = rt298_i2c_probe,
+       .probe_new = rt298_i2c_probe,
        .remove = rt298_i2c_remove,
        .id_table = rt298_i2c_id,
 };

diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c
index 577680df705206ce713d7eb4296dfd64c2b09a42..1b92634601424423242dd889e4655b4eafe9f803 100644 (file)
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
@@ -1252,8 +1252,7 @@ static __maybe_unused int rt5514_i2c_resume(struct device *dev)
        return 0;
 }
 
-static int rt5514_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5514_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5514_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5514_priv *rt5514;
@@ -1330,7 +1329,7 @@ static struct i2c_driver rt5514_i2c_driver = {
                .of_match_table = of_match_ptr(rt5514_of_match),
                .pm = &rt5514_i2_pm_ops,
        },
-       .probe = rt5514_i2c_probe,
+       .probe_new = rt5514_i2c_probe,
        .id_table = rt5514_i2c_id,
 };
 module_i2c_driver(rt5514_i2c_driver);

diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c
index 8e6414468a87b05c93082951d2ab21e6676be667..37f1bf552eff49861c5e1021f751c330f898df09 100644 (file)
--- a/sound/soc/codecs/rt5616.c
+++ b/sound/soc/codecs/rt5616.c
@@ -1337,8 +1337,7 @@ static const struct of_device_id rt5616_of_match[] = {
 MODULE_DEVICE_TABLE(of, rt5616_of_match);
 #endif
 
-static int rt5616_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int rt5616_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5616_priv *rt5616;
        unsigned int val;
@@ -1408,7 +1407,7 @@ static struct i2c_driver rt5616_i2c_driver = {
                .name = "rt5616",
                .of_match_table = of_match_ptr(rt5616_of_match),
        },
-       .probe = rt5616_i2c_probe,
+       .probe_new = rt5616_i2c_probe,
        .remove = rt5616_i2c_remove,
        .shutdown = rt5616_i2c_shutdown,
        .id_table = rt5616_i2c_id,

diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index 38356ea2bd6ef363f05bb962d4041536c0645c05..c941e878471c16b7274dacea1f859e040d2d99b9 100644 (file)
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1699,8 +1699,7 @@ static const struct regmap_config rt5631_regmap_config = {
        .use_single_write = true,
 };
 
-static int rt5631_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5631_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5631_priv *rt5631;
        int ret;
@@ -1732,7 +1731,7 @@ static struct i2c_driver rt5631_i2c_driver = {
                .name = "rt5631",
                .of_match_table = of_match_ptr(rt5631_i2c_dt_ids),
        },
-       .probe = rt5631_i2c_probe,
+       .probe_new = rt5631_i2c_probe,
        .remove   = rt5631_i2c_remove,
        .id_table = rt5631_i2c_id,
 };

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 30c2e7cb7ed2489fb80a97930c50cce95327e34d..12da2bea1a7bcb16111b5d64580bf316019f8274 100644 (file)
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2927,8 +2927,7 @@ static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np)
        return 0;
 }
 
-static int rt5640_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5640_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5640_priv *rt5640;
        int ret;
@@ -3006,7 +3005,7 @@ static struct i2c_driver rt5640_i2c_driver = {
                .acpi_match_table = ACPI_PTR(rt5640_acpi_match),
                .of_match_table = of_match_ptr(rt5640_of_match),
        },
-       .probe = rt5640_i2c_probe,
+       .probe_new = rt5640_i2c_probe,
        .id_table = rt5640_i2c_id,
 };
 module_i2c_driver(rt5640_i2c_driver);

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 197c560479470f945ee1913b14e469794e6e3e34..1518eb7e9201607a929df9eb2fde0b8555494f02 100644 (file)
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3855,8 +3855,7 @@ static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
        return 0;
 }
 
-static int rt5645_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5645_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5645_platform_data *pdata = NULL;
        const struct dmi_system_id *dmi_data;
@@ -4183,7 +4182,7 @@ static struct i2c_driver rt5645_i2c_driver = {
                .of_match_table = of_match_ptr(rt5645_of_match),
                .acpi_match_table = ACPI_PTR(rt5645_acpi_match),
        },
-       .probe = rt5645_i2c_probe,
+       .probe_new = rt5645_i2c_probe,
        .remove = rt5645_i2c_remove,
        .shutdown = rt5645_i2c_shutdown,
        .id_table = rt5645_i2c_id,

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index f302c25688d1b785df196fad826d4e3a1720a1c9..d11d201b1d03ef3a470168cc12237d6477b3da33 100644 (file)
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -2209,8 +2209,7 @@ MODULE_DEVICE_TABLE(i2c, rt5651_i2c_id);
  * Note this function MUST not look at device-properties, see the comment
  * above rt5651_apply_properties().
  */
-static int rt5651_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5651_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5651_priv *rt5651;
        int ret;
@@ -2281,7 +2280,7 @@ static struct i2c_driver rt5651_i2c_driver = {
                .acpi_match_table = ACPI_PTR(rt5651_acpi_match),
                .of_match_table = of_match_ptr(rt5651_of_match),
        },
-       .probe = rt5651_i2c_probe,
+       .probe_new = rt5651_i2c_probe,
        .id_table = rt5651_i2c_id,
 };
 module_i2c_driver(rt5651_i2c_driver);

diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index e1503c2eee81d50e63644a34509090ca01833873..6efa90f46362b67d0a575e1d7fcb4bdc717d8271 100644 (file)
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -4093,8 +4093,7 @@ static void rt5659_intel_hd_header_probe_setup(struct rt5659_priv *rt5659)
                RT5659_IL_IRQ_MASK, RT5659_IL_IRQ_EN);
 }
 
-static int rt5659_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5659_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5659_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5659_priv *rt5659;
@@ -4342,7 +4341,7 @@ static struct i2c_driver rt5659_i2c_driver = {
                .of_match_table = of_match_ptr(rt5659_of_match),
                .acpi_match_table = ACPI_PTR(rt5659_acpi_match),
        },
-       .probe = rt5659_i2c_probe,
+       .probe_new = rt5659_i2c_probe,
        .shutdown = rt5659_i2c_shutdown,
        .id_table = rt5659_i2c_id,
 };

diff --git a/sound/soc/codecs/rt5660.c b/sound/soc/codecs/rt5660.c
index 3b50fb29864e257192f44c169583cdf30802cca1..d5f9926625d23bd2237854b5ad26a28d0f469df5 100644 (file)
--- a/sound/soc/codecs/rt5660.c
+++ b/sound/soc/codecs/rt5660.c
@@ -1266,8 +1266,7 @@ static int rt5660_parse_dt(struct rt5660_priv *rt5660, struct device *dev)
        return 0;
 }
 
-static int rt5660_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5660_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5660_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5660_priv *rt5660;
@@ -1343,7 +1342,7 @@ static struct i2c_driver rt5660_i2c_driver = {
                .acpi_match_table = ACPI_PTR(rt5660_acpi_match),
                .of_match_table = of_match_ptr(rt5660_of_match),
        },
-       .probe = rt5660_i2c_probe,
+       .probe_new = rt5660_i2c_probe,
        .id_table = rt5660_i2c_id,
 };
 module_i2c_driver(rt5660_i2c_driver);

diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c
index 3a8fba101b20f03e79dc97b805a278f0693a297c..e51eed8a79ab766fb1e3ea5fd8639a9695f6ab8c 100644 (file)
--- a/sound/soc/codecs/rt5663.c
+++ b/sound/soc/codecs/rt5663.c
@@ -3490,8 +3490,7 @@ static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev)
        return 0;
 }
 
-static int rt5663_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5663_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5663_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5663_priv *rt5663;
@@ -3737,7 +3736,7 @@ static struct i2c_driver rt5663_i2c_driver = {
                .acpi_match_table = ACPI_PTR(rt5663_acpi_match),
                .of_match_table = of_match_ptr(rt5663_of_match),
        },
-       .probe = rt5663_i2c_probe,
+       .probe_new = rt5663_i2c_probe,
        .remove = rt5663_i2c_remove,
        .shutdown = rt5663_i2c_shutdown,
        .id_table = rt5663_i2c_id,

diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c
index 33e889802ff807c7568a320bb3f73e57e441d602..4a8d62e1dd2b59926700691acb5f4d055c44720f 100644 (file)
--- a/sound/soc/codecs/rt5665.c
+++ b/sound/soc/codecs/rt5665.c
@@ -4757,8 +4757,7 @@ static void rt5665_calibrate_handler(struct work_struct *work)
        rt5665_calibrate(rt5665);
 }
 
-static int rt5665_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5665_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5665_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5665_priv *rt5665;
@@ -4970,7 +4969,7 @@ static struct i2c_driver rt5665_i2c_driver = {
                .of_match_table = of_match_ptr(rt5665_of_match),
                .acpi_match_table = ACPI_PTR(rt5665_acpi_match),
        },
-       .probe = rt5665_i2c_probe,
+       .probe_new = rt5665_i2c_probe,
        .shutdown = rt5665_i2c_shutdown,
        .id_table = rt5665_i2c_id,
 };

diff --git a/sound/soc/codecs/rt5668.c b/sound/soc/codecs/rt5668.c
index 5b12cbf2ba21546867347f4a90c85668a6f418c4..01566f036ca17da2cc14c3fc0fc44831d528c6bd 100644 (file)
--- a/sound/soc/codecs/rt5668.c
+++ b/sound/soc/codecs/rt5668.c
@@ -2453,8 +2453,7 @@ static void rt5668_calibrate(struct rt5668_priv *rt5668)
 
 }
 
-static int rt5668_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5668_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5668_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5668_priv *rt5668;
@@ -2620,7 +2619,7 @@ static struct i2c_driver rt5668_i2c_driver = {
                .of_match_table = of_match_ptr(rt5668_of_match),
                .acpi_match_table = ACPI_PTR(rt5668_acpi_match),
        },
-       .probe = rt5668_i2c_probe,
+       .probe_new = rt5668_i2c_probe,
        .shutdown = rt5668_i2c_shutdown,
        .id_table = rt5668_i2c_id,
 };

diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index ce7684752bb0adc54fee43260923027f2b82a880..8a97f6db04d56c81921325b8863ff0356c34e8cb 100644 (file)
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -3046,8 +3046,7 @@ const char *rt5670_components(void)
 }
 EXPORT_SYMBOL_GPL(rt5670_components);
 
-static int rt5670_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5670_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5670_priv *rt5670;
        int ret;
@@ -3334,7 +3333,7 @@ static struct i2c_driver rt5670_i2c_driver = {
                .name = "rt5670",
                .acpi_match_table = ACPI_PTR(rt5670_acpi_match),
        },
-       .probe = rt5670_i2c_probe,
+       .probe_new = rt5670_i2c_probe,
        .remove   = rt5670_i2c_remove,
        .id_table = rt5670_i2c_id,
 };

diff --git a/sound/soc/codecs/rt5682-i2c.c b/sound/soc/codecs/rt5682-i2c.c
index 20fc0f3766dedc4ce03b308985420831534dd557..3f72f60934362d4885e47bedeac9f7d0e580da67 100644 (file)
--- a/sound/soc/codecs/rt5682-i2c.c
+++ b/sound/soc/codecs/rt5682-i2c.c
@@ -118,8 +118,7 @@ static void rt5682_i2c_disable_regulators(void *data)
        regulator_bulk_disable(ARRAY_SIZE(rt5682->supplies), rt5682->supplies);
 }
 
-static int rt5682_i2c_probe(struct i2c_client *i2c,
-               const struct i2c_device_id *id)
+static int rt5682_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5682_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5682_priv *rt5682;
@@ -335,7 +334,7 @@ static struct i2c_driver rt5682_i2c_driver = {
                .acpi_match_table = rt5682_acpi_match,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
-       .probe = rt5682_i2c_probe,
+       .probe_new = rt5682_i2c_probe,
        .remove = rt5682_i2c_remove,
        .shutdown = rt5682_i2c_shutdown,
        .id_table = rt5682_i2c_id,

diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c
index cb20dc8cd0c7d1f64bac21d0c88e6d23d44c39fa..4d44eddee901c658137e76d18e9c0f0a7386c4c5 100644 (file)
--- a/sound/soc/codecs/rt5682s.c
+++ b/sound/soc/codecs/rt5682s.c
@@ -3036,8 +3036,7 @@ static void rt5682s_i2c_disable_regulators(void *data)
                dev_err(dev, "Failed to disable supply MICVDD: %d\n", ret);
 }
 
-static int rt5682s_i2c_probe(struct i2c_client *i2c,
-               const struct i2c_device_id *id)
+static int rt5682s_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5682s_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5682s_priv *rt5682s;
@@ -3228,7 +3227,7 @@ static struct i2c_driver rt5682s_i2c_driver = {
                .acpi_match_table = rt5682s_acpi_match,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
-       .probe = rt5682s_i2c_probe,
+       .probe_new = rt5682s_i2c_probe,
        .remove = rt5682s_i2c_remove,
        .shutdown = rt5682s_i2c_shutdown,
        .id_table = rt5682s_i2c_id,