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: shwdt: 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-32-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
70b5b2b2 f80e31b3

+2 -4
+2 -4
drivers/watchdog/shwdt.c
··· 279 279 return 0; 280 280 } 281 281 282 - static int sh_wdt_remove(struct platform_device *pdev) 282 + static void sh_wdt_remove(struct platform_device *pdev) 283 283 { 284 284 watchdog_unregister_device(&sh_wdt_dev); 285 285 286 286 pm_runtime_disable(&pdev->dev); 287 - 288 - return 0; 289 287 } 290 288 291 289 static void sh_wdt_shutdown(struct platform_device *pdev) ··· 297 299 }, 298 300 299 301 .probe = sh_wdt_probe, 300 - .remove = sh_wdt_remove, 302 + .remove_new = sh_wdt_remove, 301 303 .shutdown = sh_wdt_shutdown, 302 304 }; 303 305