]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
power: supply: rx51_battery: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 18 Sep 2023 13:36:51 +0000 (15:36 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Mon, 18 Sep 2023 18:08:03 +0000 (20:08 +0200)
The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code. However the value returned is ignored (apart
from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return
void. In the first step of this quest all drivers are converted to
.remove_new() which already returns void. Eventually after all drivers
are converted, .remove_new() is renamed to .remove().

Trivially convert this driver from always returning zero in the remove
callback to the void returning variant.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230918133700.1254499-24-u.kleine-koenig@pengutronix.de
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/rx51_battery.c

index 6e488ecf4dcb24d3f781c83fc52fa17296919afd..e2bfc81f0fd970d6a094cc77327e304306e7973d 100644 (file)
@@ -246,7 +246,7 @@ error:
        return ret;
 }
 
-static int rx51_battery_remove(struct platform_device *pdev)
+static void rx51_battery_remove(struct platform_device *pdev)
 {
        struct rx51_device_info *di = platform_get_drvdata(pdev);
 
@@ -255,8 +255,6 @@ static int rx51_battery_remove(struct platform_device *pdev)
        iio_channel_release(di->channel_vbat);
        iio_channel_release(di->channel_bsi);
        iio_channel_release(di->channel_temp);
-
-       return 0;
 }
 
 #ifdef CONFIG_OF
@@ -269,7 +267,7 @@ MODULE_DEVICE_TABLE(of, n900_battery_of_match);
 
 static struct platform_driver rx51_battery_driver = {
        .probe = rx51_battery_probe,
-       .remove = rx51_battery_remove,
+       .remove_new = rx51_battery_remove,
        .driver = {
                .name = "rx51-battery",
                .of_match_table = of_match_ptr(n900_battery_of_match),