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

diff --git a/sound/soc/codecs/ak4118.c b/sound/soc/codecs/ak4118.c
index 2e6bafd..5c4a78c 100644 (file)
--- a/sound/soc/codecs/ak4118.c
+++ b/sound/soc/codecs/ak4118.c
@@ -356,8 +356,7 @@ static const struct regmap_config ak4118_regmap = {
        .max_register = AK4118_REG_MAX - 1,
 };
 
-static int ak4118_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int ak4118_i2c_probe(struct i2c_client *i2c)
 {
        struct ak4118_priv *ak4118;
        int ret;
@@ -416,7 +415,7 @@ static struct i2c_driver ak4118_i2c_driver = {
                .of_match_table = of_match_ptr(ak4118_of_match),
        },
        .id_table = ak4118_id_table,
-       .probe  = ak4118_i2c_probe,
+       .probe_new = ak4118_i2c_probe,
 };
 
 module_i2c_driver(ak4118_i2c_driver);

diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index 91e7a57..cc803e7 100644 (file)
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -405,8 +405,7 @@ static const struct snd_soc_component_driver soc_component_dev_ak4535 = {
        .non_legacy_dai_naming  = 1,
 };
 
-static int ak4535_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int ak4535_i2c_probe(struct i2c_client *i2c)
 {
        struct ak4535_priv *ak4535;
        int ret;
@@ -441,7 +440,7 @@ static struct i2c_driver ak4535_i2c_driver = {
        .driver = {
                .name = "ak4535",
        },
-       .probe =    ak4535_i2c_probe,
+       .probe_new = ak4535_i2c_probe,
        .id_table = ak4535_i2c_id,
 };
 

diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index 04aef0e..d8d9cc7 100644 (file)
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -548,8 +548,7 @@ static const struct regmap_config ak4641_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int ak4641_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int ak4641_i2c_probe(struct i2c_client *i2c)
 {
        struct ak4641_platform_data *pdata = i2c->dev.platform_data;
        struct ak4641_priv *ak4641;
@@ -632,7 +631,7 @@ static struct i2c_driver ak4641_i2c_driver = {
        .driver = {
                .name = "ak4641",
        },
-       .probe =    ak4641_i2c_probe,
+       .probe_new = ak4641_i2c_probe,
        .remove =   ak4641_i2c_remove,
        .id_table = ak4641_i2c_id,
 };

diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index e9d1251..60edcbe 100644 (file)
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -629,8 +629,7 @@ static const struct regmap_config ak4671_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int ak4671_i2c_probe(struct i2c_client *client,
-                           const struct i2c_device_id *id)
+static int ak4671_i2c_probe(struct i2c_client *client)
 {
        struct regmap *regmap;
        int ret;
@@ -657,7 +656,7 @@ static struct i2c_driver ak4671_i2c_driver = {
        .driver = {
                .name = "ak4671-codec",
        },
-       .probe = ak4671_i2c_probe,
+       .probe_new = ak4671_i2c_probe,
        .id_table = ak4671_i2c_id,
 };