power: supply: cpcap-charger: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 18 Sep 2023 13:36:37 +0000 (15:36 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Mon, 18 Sep 2023 18:08:02 +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-10-u.kleine-koenig@pengutronix.de
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/cpcap-charger.c

index be9764541d52a5e2338213b286c0d9e111df67e7..431e951cccf0afc8f2cd8e95afc70779e6a88a19 100644 (file)
@@ -966,11 +966,9 @@ static void cpcap_charger_shutdown(struct platform_device *pdev)
        cancel_delayed_work_sync(&ddata->detect_work);
 }
 
-static int cpcap_charger_remove(struct platform_device *pdev)
+static void cpcap_charger_remove(struct platform_device *pdev)
 {
        cpcap_charger_shutdown(pdev);
-
-       return 0;
 }
 
 static struct platform_driver cpcap_charger_driver = {
@@ -980,7 +978,7 @@ static struct platform_driver cpcap_charger_driver = {
                .of_match_table = of_match_ptr(cpcap_charger_id_table),
        },
        .shutdown = cpcap_charger_shutdown,
-       .remove = cpcap_charger_remove,
+       .remove_new = cpcap_charger_remove,
 };
 module_platform_driver(cpcap_charger_driver);