summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8940.c
diff options
context:
space:
mode:
authorStephen Kitt <steve@sk2.org>2022-04-05 14:24:11 +0200
committerMark Brown <broonie@kernel.org>2022-04-07 00:37:53 +0200
commit97b0b6e3fb8a390205f3266b1fba3e195b9edf30 (patch)
tree6adc33026cf9df32f0a962f6ec2d6fe71d3b779a /sound/soc/codecs/wm8940.c
parentASoC: lm49xxx: use simple i2c probe function (diff)
downloadlinux-97b0b6e3fb8a390205f3266b1fba3e195b9edf30.tar.xz
linux-97b0b6e3fb8a390205f3266b1fba3e195b9edf30.zip
ASoC: wm*: 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. wm8731.c is excluded and will be submitted separately. This avoids scanning the identifier tables during probes. Signed-off-by: Stephen Kitt <steve@sk2.org> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220405122411.2096387-1-steve@sk2.org Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm8940.c')
-rw-r--r--sound/soc/codecs/wm8940.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 440d048ef0c0..99b4524f53d8 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -750,8 +750,7 @@ static const struct regmap_config wm8940_regmap = {
.volatile_reg = wm8940_volatile_register,
};
-static int wm8940_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int wm8940_i2c_probe(struct i2c_client *i2c)
{
struct wm8940_priv *wm8940;
int ret;
@@ -783,7 +782,7 @@ static struct i2c_driver wm8940_i2c_driver = {
.driver = {
.name = "wm8940",
},
- .probe = wm8940_i2c_probe,
+ .probe_new = wm8940_i2c_probe,
.id_table = wm8940_i2c_id,
};