]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
power: supply: smb347: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:44:28 +0000 (23:44 +0100)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Sun, 20 Nov 2022 19:12:17 +0000 (20:12 +0100)
.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>
drivers/power/supply/smb347-charger.c

index 996a82f8a2a1dd11a9c6e2dd809355f12bc6f981..b5f0383102824ebfface63580aae6e9f722801f5 100644 (file)
@@ -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,