Skip to content

Commit 2faef27

Browse files
Uwe Kleine-KönigWim Van Sebroeck
authored andcommitted
watchdog: starfive-wdt: 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> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20231106154807.3866712-5-u.kleine-koenig@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent 6a7b3de commit 2faef27

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/watchdog/starfive-wdt.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ static int starfive_wdt_probe(struct platform_device *pdev)
504504
return ret;
505505
}
506506

507-
static int starfive_wdt_remove(struct platform_device *pdev)
507+
static void starfive_wdt_remove(struct platform_device *pdev)
508508
{
509509
struct starfive_wdt *wdt = platform_get_drvdata(pdev);
510510

@@ -516,8 +516,6 @@ static int starfive_wdt_remove(struct platform_device *pdev)
516516
else
517517
/* disable clock without PM */
518518
starfive_wdt_disable_clock(wdt);
519-
520-
return 0;
521519
}
522520

523521
static void starfive_wdt_shutdown(struct platform_device *pdev)
@@ -587,7 +585,7 @@ MODULE_DEVICE_TABLE(of, starfive_wdt_match);
587585

588586
static struct platform_driver starfive_wdt_driver = {
589587
.probe = starfive_wdt_probe,
590-
.remove = starfive_wdt_remove,
588+
.remove_new = starfive_wdt_remove,
591589
.shutdown = starfive_wdt_shutdown,
592590
.driver = {
593591
.name = "starfive-wdt",

0 commit comments

Comments
 (0)