Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
authored by
Uwe Kleine-König
and committed by
Lee Jones
54f872ba
521fcf40
+3
-3
+3
-3
drivers/mfd/wm8994-core.c
+3
-3
drivers/mfd/wm8994-core.c
···
623
623
};
624
624
MODULE_DEVICE_TABLE(of, wm8994_of_match);
625
625
626
-
static int wm8994_i2c_probe(struct i2c_client *i2c,
627
-
const struct i2c_device_id *id)
626
+
static int wm8994_i2c_probe(struct i2c_client *i2c)
628
627
{
628
+
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
629
629
const struct of_device_id *of_id;
630
630
struct wm8994 *wm8994;
631
631
int ret;
···
683
683
.pm = &wm8994_pm_ops,
684
684
.of_match_table = wm8994_of_match,
685
685
},
686
-
.probe = wm8994_i2c_probe,
686
+
.probe_new = wm8994_i2c_probe,
687
687
.remove = wm8994_i2c_remove,
688
688
.id_table = wm8994_i2c_id,
689
689
};