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

watchdog: sch311x: 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 (mostly) ignored
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.

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>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230303213716.2123717-31-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 4dca58a8
...@@ -425,7 +425,7 @@ static int sch311x_wdt_probe(struct platform_device *pdev) ...@@ -425,7 +425,7 @@ static int sch311x_wdt_probe(struct platform_device *pdev)
return err; return err;
} }
static int sch311x_wdt_remove(struct platform_device *pdev) static void sch311x_wdt_remove(struct platform_device *pdev)
{ {
/* Stop the timer before we leave */ /* Stop the timer before we leave */
if (!nowayout) if (!nowayout)
...@@ -436,7 +436,6 @@ static int sch311x_wdt_remove(struct platform_device *pdev) ...@@ -436,7 +436,6 @@ static int sch311x_wdt_remove(struct platform_device *pdev)
release_region(sch311x_wdt_data.runtime_reg + WDT_TIME_OUT, 4); release_region(sch311x_wdt_data.runtime_reg + WDT_TIME_OUT, 4);
release_region(sch311x_wdt_data.runtime_reg + GP60, 1); release_region(sch311x_wdt_data.runtime_reg + GP60, 1);
sch311x_wdt_data.runtime_reg = 0; sch311x_wdt_data.runtime_reg = 0;
return 0;
} }
static void sch311x_wdt_shutdown(struct platform_device *dev) static void sch311x_wdt_shutdown(struct platform_device *dev)
...@@ -447,7 +446,7 @@ static void sch311x_wdt_shutdown(struct platform_device *dev) ...@@ -447,7 +446,7 @@ static void sch311x_wdt_shutdown(struct platform_device *dev)
static struct platform_driver sch311x_wdt_driver = { static struct platform_driver sch311x_wdt_driver = {
.probe = sch311x_wdt_probe, .probe = sch311x_wdt_probe,
.remove = sch311x_wdt_remove, .remove_new = sch311x_wdt_remove,
.shutdown = sch311x_wdt_shutdown, .shutdown = sch311x_wdt_shutdown,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
......
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