Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Uwe Kleine-König and committed by
Wim Van Sebroeck
6a7b3de6 de81f74b

+2 -4
+2 -4
drivers/watchdog/at91sam9_wdt.c
··· 372 372 return 0; 373 373 } 374 374 375 - static int at91wdt_remove(struct platform_device *pdev) 375 + static void at91wdt_remove(struct platform_device *pdev) 376 376 { 377 377 struct at91wdt *wdt = platform_get_drvdata(pdev); 378 378 watchdog_unregister_device(&wdt->wdd); 379 379 380 380 pr_warn("I quit now, hardware will probably reboot!\n"); 381 381 del_timer(&wdt->timer); 382 - 383 - return 0; 384 382 } 385 383 386 384 #if defined(CONFIG_OF) ··· 392 394 393 395 static struct platform_driver at91wdt_driver = { 394 396 .probe = at91wdt_probe, 395 - .remove = at91wdt_remove, 397 + .remove_new = at91wdt_remove, 396 398 .driver = { 397 399 .name = "at91_wdt", 398 400 .of_match_table = of_match_ptr(at91_wdt_dt_ids),