UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Uwe Kleine-König 2022-11-18 23:43:32 +01:00 committed by Lee Jones
parent 490e11b7c3
commit 5fb66be1bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/wm831x-i2c.c
View File

@ -21,9 +21,9 @@
#include <linux/mfd/wm831x/core.h> #include <linux/mfd/wm831x/core.h>
#include <linux/mfd/wm831x/pdata.h> #include <linux/mfd/wm831x/pdata.h>
static int wm831x_i2c_probe(struct i2c_client *i2c, static int wm831x_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
struct wm831x_pdata *pdata = dev_get_platdata(&i2c->dev); struct wm831x_pdata *pdata = dev_get_platdata(&i2c->dev);
const struct of_device_id *of_id; const struct of_device_id *of_id;
struct wm831x *wm831x; struct wm831x *wm831x;
@ -102,7 +102,7 @@ static struct i2c_driver wm831x_i2c_driver = {
.of_match_table = of_match_ptr(wm831x_of_match), .of_match_table = of_match_ptr(wm831x_of_match),
.suppress_bind_attrs = true, .suppress_bind_attrs = true,
}, },
.probe = wm831x_i2c_probe, .probe_new = wm831x_i2c_probe,
.id_table = wm831x_i2c_id, .id_table = wm831x_i2c_id,
}; };