Skip to content

Commit 0569d4c

Browse files
Uwe Kleine-Königsre
authored andcommitted
power: supply: sc2731_charger: Convert to platform remove callback returning void
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-25-u.kleine-koenig@pengutronix.de Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 9f0da40 commit 0569d4c

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/power/supply/sc2731_charger.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -511,13 +511,11 @@ static int sc2731_charger_probe(struct platform_device *pdev)
511511
return 0;
512512
}
513513

514-
static int sc2731_charger_remove(struct platform_device *pdev)
514+
static void sc2731_charger_remove(struct platform_device *pdev)
515515
{
516516
struct sc2731_charger_info *info = platform_get_drvdata(pdev);
517517

518518
usb_unregister_notifier(info->usb_phy, &info->usb_notify);
519-
520-
return 0;
521519
}
522520

523521
static const struct of_device_id sc2731_charger_of_match[] = {
@@ -532,7 +530,7 @@ static struct platform_driver sc2731_charger_driver = {
532530
.of_match_table = sc2731_charger_of_match,
533531
},
534532
.probe = sc2731_charger_probe,
535-
.remove = sc2731_charger_remove,
533+
.remove_new = sc2731_charger_remove,
536534
};
537535

538536
module_platform_driver(sc2731_charger_driver);

0 commit comments

Comments
 (0)