Commit 6a7b3de6 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wim Van Sebroeck

watchdog: at91sam9_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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20231106154807.3866712-4-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent de81f74b
...@@ -372,15 +372,13 @@ static int at91wdt_probe(struct platform_device *pdev) ...@@ -372,15 +372,13 @@ static int at91wdt_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int at91wdt_remove(struct platform_device *pdev) static void at91wdt_remove(struct platform_device *pdev)
{ {
struct at91wdt *wdt = platform_get_drvdata(pdev); struct at91wdt *wdt = platform_get_drvdata(pdev);
watchdog_unregister_device(&wdt->wdd); watchdog_unregister_device(&wdt->wdd);
pr_warn("I quit now, hardware will probably reboot!\n"); pr_warn("I quit now, hardware will probably reboot!\n");
del_timer(&wdt->timer); del_timer(&wdt->timer);
return 0;
} }
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
...@@ -394,7 +392,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); ...@@ -394,7 +392,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
static struct platform_driver at91wdt_driver = { static struct platform_driver at91wdt_driver = {
.probe = at91wdt_probe, .probe = at91wdt_probe,
.remove = at91wdt_remove, .remove_new = at91wdt_remove,
.driver = { .driver = {
.name = "at91_wdt", .name = "at91_wdt",
.of_match_table = of_match_ptr(at91_wdt_dt_ids), .of_match_table = of_match_ptr(at91_wdt_dt_ids),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment