power: supply: max17042_battery: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:44:23 +0000 (23:44 +0100)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Sun, 20 Nov 2022 19:12:16 +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>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/max17042_battery.c

index ab031bbfbe785b8ebec1ea48a264c8a6e569012e..89cabe8ed3b06edc9b3c755ec03f43ea12a5ee8c 100644 (file)
@@ -1031,9 +1031,9 @@ static const struct power_supply_desc max17042_no_current_sense_psy_desc = {
        .num_properties = ARRAY_SIZE(max17042_battery_props) - 2,
 };
 
-static int max17042_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int max17042_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct i2c_adapter *adapter = client->adapter;
        const struct power_supply_desc *max17042_desc = &max17042_psy_desc;
        struct power_supply_config psy_cfg = {};
@@ -1220,7 +1220,7 @@ static struct i2c_driver max17042_i2c_driver = {
                .of_match_table = of_match_ptr(max17042_dt_match),
                .pm     = &max17042_pm_ops,
        },
-       .probe          = max17042_probe,
+       .probe_new      = max17042_probe,
        .id_table       = max17042_id,
 };
 module_i2c_driver(max17042_i2c_driver);