]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
power: supply: bq25890: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:44:14 +0000 (23:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:26:30 +0000 (13:26 +0100)
[ Upstream commit c5cddca2351b291c8787b45cd046b1dfeb86979f ]

The probe function doesn't make use of the i2c_device_id * parameter so it
can be trivially converted.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Stable-dep-of: a7aaa80098d5 ("power: supply: bq25890: Ensure pump_express_work is cancelled on remove")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/power/supply/bq25890_charger.c

index 86228753e8043931ba60bb6857e64287cf501d29..b4c8481ea17b051c1069d143b9a1d7c0413a8e3a 100644 (file)
@@ -1189,8 +1189,7 @@ static int bq25890_fw_probe(struct bq25890_device *bq)
        return 0;
 }
 
-static int bq25890_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int bq25890_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct bq25890_device *bq;
@@ -1391,7 +1390,7 @@ static struct i2c_driver bq25890_driver = {
                .acpi_match_table = ACPI_PTR(bq25890_acpi_match),
                .pm = &bq25890_pm,
        },
-       .probe = bq25890_probe,
+       .probe_new = bq25890_probe,
        .remove = bq25890_remove,
        .shutdown = bq25890_shutdown,
        .id_table = bq25890_i2c_ids,