diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-11-18 23:43:32 +0100 |
|---|---|---|
| committer | Lee Jones <lee@kernel.org> | 2022-12-07 14:27:26 +0100 |
| commit | 5fb66be1bf4984ab0c49e3296efd66fdb65cace9 (patch) | |
| tree | 3b0c10ac2409bdab3fadf76616d74bf818f9b9d8 /drivers/mfd/wm831x-i2c.c | |
| parent | mfd: wl1273-core: Convert to i2c's .probe_new() (diff) | |
| download | linux-5fb66be1bf4984ab0c49e3296efd66fdb65cace9.tar.xz linux-5fb66be1bf4984ab0c49e3296efd66fdb65cace9.zip | |
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
Diffstat (limited to 'drivers/mfd/wm831x-i2c.c')
| -rw-r--r-- | drivers/mfd/wm831x-i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c index daa1ad036595..9dbe96e2d46a 100644 --- a/drivers/mfd/wm831x-i2c.c +++ b/drivers/mfd/wm831x-i2c.c @@ -21,9 +21,9 @@ #include <linux/mfd/wm831x/core.h> #include <linux/mfd/wm831x/pdata.h> -static int wm831x_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int wm831x_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct wm831x_pdata *pdata = dev_get_platdata(&i2c->dev); const struct of_device_id *of_id; struct wm831x *wm831x; @@ -102,7 +102,7 @@ static struct i2c_driver wm831x_i2c_driver = { .of_match_table = of_match_ptr(wm831x_of_match), .suppress_bind_attrs = true, }, - .probe = wm831x_i2c_probe, + .probe_new = wm831x_i2c_probe, .id_table = wm831x_i2c_id, }; |