On Fri, Mar 03, 2023 at 10:37:08PM +0100, Uwe Kleine-König wrote:
> 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@xxxxxxxxxxxxxx>
> ---
> drivers/watchdog/rn5t618_wdt.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c
> index 40d8ebd8c0ac..b0da5cc8ccdf 100644
> --- a/drivers/watchdog/rn5t618_wdt.c
> +++ b/drivers/watchdog/rn5t618_wdt.c
> @@ -181,18 +181,16 @@ static int rn5t618_wdt_probe(struct platform_device *pdev)
> return watchdog_register_device(&wdt->wdt_dev);
> }
>
> -static int rn5t618_wdt_remove(struct platform_device *pdev)
> +static void rn5t618_wdt_remove(struct platform_device *pdev)
> {
> struct rn5t618_wdt *wdt = platform_get_drvdata(pdev);
>
> watchdog_unregister_device(&wdt->wdt_dev);
> -
> - return 0;
> }
Better call devm_watchdog_register_device() in the probe function and drop
the remove function entirely.
Guenter
>
> static struct platform_driver rn5t618_wdt_driver = {
> .probe = rn5t618_wdt_probe,
> - .remove = rn5t618_wdt_remove,
> + .remove_new = rn5t618_wdt_remove,
> .driver = {
> .name = DRIVER_NAME,
> },
> --
> 2.39.1
>
