The previous conversion back to .probe() applied in commit 9abcd24002bf
("ASoC: Switch i2c drivers back to use .probe()") was created based on
v6.3. Since then two more drivers were added which need to be convert
back in the same way before eventually .probe_new() can be dropped from
struct i2c_driver.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
---
Hello,
cs35l56 was already in v6.4-rc1, ssm3515 is only in next. This patch is
based on 4ac690bbae02 ("ASoC: ssm3515: Add new amp driver") which is the
oldest commit in next that has both drivers.
Best regards
Uwe
sound/soc/codecs/cs35l56-i2c.c | 2 +-
sound/soc/codecs/ssm3515.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/cs35l56-i2c.c b/sound/soc/codecs/cs35l56-i2c.c
index 295caad26224..ed2a41943d97 100644
--- a/sound/soc/codecs/cs35l56-i2c.c
+++ b/sound/soc/codecs/cs35l56-i2c.c
@@ -68,7 +68,7 @@ static struct i2c_driver cs35l56_i2c_driver = {
.pm = &cs35l56_pm_ops_i2c_spi,
},
.id_table = cs35l56_id_i2c,
- .probe_new = cs35l56_i2c_probe,
+ .probe = cs35l56_i2c_probe,
.remove = cs35l56_i2c_remove,
};
diff --git a/sound/soc/codecs/ssm3515.c b/sound/soc/codecs/ssm3515.c
index 784e890031a4..008cb3eb5758 100644
--- a/sound/soc/codecs/ssm3515.c
+++ b/sound/soc/codecs/ssm3515.c
@@ -439,7 +439,7 @@ static struct i2c_driver ssm3515_i2c_driver = {
.name = "ssm3515",
.of_match_table = of_match_ptr(ssm3515_of_match),
},
- .probe_new = ssm3515_i2c_probe,
+ .probe = ssm3515_i2c_probe,
};
module_i2c_driver(ssm3515_i2c_driver);
base-commit: 4ac690bbae02e26e36e133becd86babb657126ef
--
2.39.2
