summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8995.c
diff options
context:
space:
mode:
authorStephen Kitt <steve@sk2.org>2022-04-05 15:24:11 +0300
committerMark Brown <broonie@kernel.org>2022-04-07 01:37:53 +0300
commit97b0b6e3fb8a390205f3266b1fba3e195b9edf30 (patch)
tree6adc33026cf9df32f0a962f6ec2d6fe71d3b779a /sound/soc/codecs/wm8995.c
parent6b84012ef242c8793c1fdcc002db48c822bb641b (diff)
downloadlinux-97b0b6e3fb8a390205f3266b1fba3e195b9edf30.tar.xz
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/wm8995.c')
-rw-r--r--sound/soc/codecs/wm8995.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index b896d9c5bea0..ea9727446707 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -2231,8 +2231,7 @@ static struct spi_driver wm8995_spi_driver = {
#endif
#if IS_ENABLED(CONFIG_I2C)
-static int wm8995_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int wm8995_i2c_probe(struct i2c_client *i2c)
{
struct wm8995_priv *wm8995;
int ret;
@@ -2270,7 +2269,7 @@ static struct i2c_driver wm8995_i2c_driver = {
.driver = {
.name = "wm8995",
},
- .probe = wm8995_i2c_probe,
+ .probe_new = wm8995_i2c_probe,
.id_table = wm8995_i2c_id
};
#endif