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

diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index ff33eab6f9def579937546f7b3857f2f5fdcd3d8..4407166bb3388e62d47dcb88b150b3076181706a 100644 (file)
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -789,8 +789,7 @@ static const struct regmap_config es8316_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int es8316_i2c_probe(struct i2c_client *i2c_client,
-                           const struct i2c_device_id *id)
+static int es8316_i2c_probe(struct i2c_client *i2c_client)
 {
        struct device *dev = &i2c_client->dev;
        struct es8316_priv *es8316;
@@ -852,7 +851,7 @@ static struct i2c_driver es8316_i2c_driver = {
                .acpi_match_table       = ACPI_PTR(es8316_acpi_match),
                .of_match_table         = of_match_ptr(es8316_of_match),
        },
-       .probe          = es8316_i2c_probe,
+       .probe_new      = es8316_i2c_probe,
        .id_table       = es8316_i2c_id,
 };
 module_i2c_driver(es8316_i2c_driver);

diff --git a/sound/soc/codecs/es8328-i2c.c b/sound/soc/codecs/es8328-i2c.c
index 6b0df0d750dc5dab211ef07fefb7af229ef1b9d1..68072e99fcc738dcc296c602f9dd9ac476569386 100644 (file)
--- a/sound/soc/codecs/es8328-i2c.c
+++ b/sound/soc/codecs/es8328-i2c.c
@@ -29,8 +29,7 @@ static const struct of_device_id es8328_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, es8328_of_match);
 
-static int es8328_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int es8328_i2c_probe(struct i2c_client *i2c)
 {
        return es8328_probe(&i2c->dev,
                        devm_regmap_init_i2c(i2c, &es8328_regmap_config));
@@ -41,7 +40,7 @@ static struct i2c_driver es8328_i2c_driver = {
                .name           = "es8328",
                .of_match_table = es8328_of_match,
        },
-       .probe    = es8328_i2c_probe,
+       .probe_new = es8328_i2c_probe,
        .id_table = es8328_id,
 };