summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:43:18 +0100
committerLee Jones <lee@kernel.org>2022-12-07 13:27:25 +0000
commitd28fa288ea506812ef73980b8c3dc9c39ec8c18b (patch)
tree28b907ec597bcbae40e1c2313bd65ce03858faac /drivers/mfd
parent40ee15f763906ce1d8a47261a3343507f5c7bc9a (diff)
downloadlinux-d28fa288ea506812ef73980b8c3dc9c39ec8c18b.tar.bz2
mfd: tc3589x: 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> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20221118224540.619276-465-uwe@kleine-koenig.org
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/tc3589x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index d5d0ec117acb..b0f4fff5872d 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -352,9 +352,9 @@ tc3589x_of_probe(struct device *dev, enum tc3589x_version *version)
return pdata;
}
-static int tc3589x_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int tc3589x_probe(struct i2c_client *i2c)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
struct device_node *np = i2c->dev.of_node;
struct tc3589x_platform_data *pdata = dev_get_platdata(&i2c->dev);
struct tc3589x *tc3589x;
@@ -486,7 +486,7 @@ static struct i2c_driver tc3589x_driver = {
.pm = &tc3589x_dev_pm_ops,
.of_match_table = of_match_ptr(tc3589x_match),
},
- .probe = tc3589x_probe,
+ .probe_new = tc3589x_probe,
.remove = tc3589x_remove,
.id_table = tc3589x_id,
};