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: 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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230303213716.2123717-31-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
f80e31b3 4dca58a8

+2 -3
+2 -3
drivers/watchdog/sch311x_wdt.c
··· 425 425 return err; 426 426 } 427 427 428 - static int sch311x_wdt_remove(struct platform_device *pdev) 428 + static void sch311x_wdt_remove(struct platform_device *pdev) 429 429 { 430 430 /* Stop the timer before we leave */ 431 431 if (!nowayout) ··· 436 436 release_region(sch311x_wdt_data.runtime_reg + WDT_TIME_OUT, 4); 437 437 release_region(sch311x_wdt_data.runtime_reg + GP60, 1); 438 438 sch311x_wdt_data.runtime_reg = 0; 439 - return 0; 440 439 } 441 440 442 441 static void sch311x_wdt_shutdown(struct platform_device *dev) ··· 446 447 447 448 static struct platform_driver sch311x_wdt_driver = { 448 449 .probe = sch311x_wdt_probe, 449 - .remove = sch311x_wdt_remove, 450 + .remove_new = sch311x_wdt_remove, 450 451 .shutdown = sch311x_wdt_shutdown, 451 452 .driver = { 452 453 .name = DRV_NAME,