Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
mfd: wm831x-i2c: 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-479-uwe@kleine-koenig.org
authored by
Uwe Kleine-König
and committed by
Lee Jones
5fb66be1
490e11b7
+3
-3
+3
-3
drivers/mfd/wm831x-i2c.c
+3
-3
drivers/mfd/wm831x-i2c.c
···
21
21
#include <linux/mfd/wm831x/core.h>
22
22
#include <linux/mfd/wm831x/pdata.h>
23
23
24
-
static int wm831x_i2c_probe(struct i2c_client *i2c,
25
-
const struct i2c_device_id *id)
24
+
static int wm831x_i2c_probe(struct i2c_client *i2c)
26
25
{
26
+
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
27
27
struct wm831x_pdata *pdata = dev_get_platdata(&i2c->dev);
28
28
const struct of_device_id *of_id;
29
29
struct wm831x *wm831x;
···
102
102
.of_match_table = of_match_ptr(wm831x_of_match),
103
103
.suppress_bind_attrs = true,
104
104
},
105
-
.probe = wm831x_i2c_probe,
105
+
.probe_new = wm831x_i2c_probe,
106
106
.id_table = wm831x_i2c_id,
107
107
};
108
108