Skip to content

Commit 6a7b3de

Browse files
Uwe Kleine-KönigWim Van Sebroeck
authored andcommitted
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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20231106154807.3866712-4-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 de81f74 commit 6a7b3de

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/watchdog/at91sam9_wdt.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,15 +372,13 @@ static int at91wdt_probe(struct platform_device *pdev)
372372
return 0;
373373
}
374374

375-
static int at91wdt_remove(struct platform_device *pdev)
375+
static void at91wdt_remove(struct platform_device *pdev)
376376
{
377377
struct at91wdt *wdt = platform_get_drvdata(pdev);
378378
watchdog_unregister_device(&wdt->wdd);
379379

380380
pr_warn("I quit now, hardware will probably reboot!\n");
381381
del_timer(&wdt->timer);
382-
383-
return 0;
384382
}
385383

386384
#if defined(CONFIG_OF)
@@ -394,7 +392,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
394392

395393
static struct platform_driver at91wdt_driver = {
396394
.probe = at91wdt_probe,
397-
.remove = at91wdt_remove,
395+
.remove_new = at91wdt_remove,
398396
.driver = {
399397
.name = "at91_wdt",
400398
.of_match_table = of_match_ptr(at91_wdt_dt_ids),

0 commit comments

Comments
 (0)