Skip to content

Commit 2973706

Browse files
Uwe Kleine-Königsre
authored andcommitted
power: reset: syscon-poweroff: 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() will be 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/20231104211501.3676352-29-u.kleine-koenig@pengutronix.de Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 30d26d2 commit 2973706

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/power/reset/syscon-poweroff.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,10 @@ static int syscon_poweroff_probe(struct platform_device *pdev)
7676
return 0;
7777
}
7878

79-
static int syscon_poweroff_remove(struct platform_device *pdev)
79+
static void syscon_poweroff_remove(struct platform_device *pdev)
8080
{
8181
if (pm_power_off == syscon_poweroff)
8282
pm_power_off = NULL;
83-
84-
return 0;
8583
}
8684

8785
static const struct of_device_id syscon_poweroff_of_match[] = {
@@ -91,7 +89,7 @@ static const struct of_device_id syscon_poweroff_of_match[] = {
9189

9290
static struct platform_driver syscon_poweroff_driver = {
9391
.probe = syscon_poweroff_probe,
94-
.remove = syscon_poweroff_remove,
92+
.remove_new = syscon_poweroff_remove,
9593
.driver = {
9694
.name = "syscon-poweroff",
9795
.of_match_table = syscon_poweroff_of_match,

0 commit comments

Comments
 (0)