diff mbox series

[09/32] power: supply: cpcap-charger: Convert to platform remove callback returning void

Message ID 20230918133700.1254499-10-u.kleine-koenig@pengutronix.de
State Accepted
Commit 1abbcff9f0c087e88ae542e0d6b0ee0689881027
Headers show
Series power: supply: Convert to platform remove callback returning void | expand

Commit Message

Uwe Kleine-König Sept. 18, 2023, 1:36 p.m. UTC
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>
 drivers/power/supply/cpcap-charger.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index be9764541d52..431e951cccf0 100644
--- a/drivers/power/supply/cpcap-charger.c
+++ b/drivers/power/supply/cpcap-charger.c
@@ -966,11 +966,9 @@  static void cpcap_charger_shutdown(struct platform_device *pdev)
-static int cpcap_charger_remove(struct platform_device *pdev)
+static void cpcap_charger_remove(struct platform_device *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,