summaryrefslogtreecommitdiffstats
path: root/drivers/power/supply
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:44:28 +0100
committerSebastian Reichel <sebastian.reichel@collabora.com>2022-11-20 20:12:17 +0100
commit6d43a4b0b2f8ab6c9893e2673a133d1798b230e1 (patch)
treef1fe298c886cde34d14661b02f5d950368a07abf /drivers/power/supply
parent02d1a40141a7b9d9cb8ef151c14e7d7aeaa56966 (diff)
downloadlinux-stable-6d43a4b0b2f8ab6c9893e2673a133d1798b230e1.tar.gz
linux-stable-6d43a4b0b2f8ab6c9893e2673a133d1798b230e1.tar.bz2
linux-stable-6d43a4b0b2f8ab6c9893e2673a133d1798b230e1.zip
power: supply: smb347: 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: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply')
-rw-r--r--drivers/power/supply/smb347-charger.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c
index 996a82f8a2a1..b5f038310282 100644
--- a/drivers/power/supply/smb347-charger.c
+++ b/drivers/power/supply/smb347-charger.c
@@ -1528,9 +1528,9 @@ static const struct regulator_desc smb347_usb_vbus_regulator_desc = {
.n_voltages = 1,
};
-static int smb347_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int smb347_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct power_supply_config mains_usb_cfg = {};
struct regulator_config usb_rdev_cfg = {};
struct device *dev = &client->dev;
@@ -1629,7 +1629,7 @@ static struct i2c_driver smb347_driver = {
.name = "smb347",
.of_match_table = smb3xx_of_match,
},
- .probe = smb347_probe,
+ .probe_new = smb347_probe,
.remove = smb347_remove,
.shutdown = smb347_shutdown,
.id_table = smb347_id,