summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:43:35 +0100
committerLee Jones <lee@kernel.org>2022-12-07 14:27:27 +0100
commit54f872baf6b17a74492f4d601be3c36626907178 (patch)
tree0272d60f72ee21caabf4bbf14a130e153266442e /drivers
parentmfd: wm8400-core: Convert to i2c's .probe_new() (diff)
downloadlinux-54f872baf6b17a74492f4d601be3c36626907178.tar.xz
linux-54f872baf6b17a74492f4d601be3c36626907178.zip
mfd: wm8994-core: Convert to i2c's .probe_new()
.probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in the probe function. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20221118224540.619276-482-uwe@kleine-koenig.org
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/wm8994-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 7e88f5b0abe6..53994abe7596 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -623,9 +623,9 @@ static const struct of_device_id wm8994_of_match[] = {
};
MODULE_DEVICE_TABLE(of, wm8994_of_match);
-static int wm8994_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int wm8994_i2c_probe(struct i2c_client *i2c)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
const struct of_device_id *of_id;
struct wm8994 *wm8994;
int ret;
@@ -683,7 +683,7 @@ static struct i2c_driver wm8994_i2c_driver = {
.pm = &wm8994_pm_ops,
.of_match_table = wm8994_of_match,
},
- .probe = wm8994_i2c_probe,
+ .probe_new = wm8994_i2c_probe,
.remove = wm8994_i2c_remove,
.id_table = wm8994_i2c_id,
};