[PATCH 33/34] watchdog: stmp3xxx_rtc: Convert to platform remove callback returning void

Guenter Roeck linux at roeck-us.net
Sat Mar 4 09:14:05 PST 2023


On Fri, Mar 03, 2023 at 10:37:15PM +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 at pengutronix.de>

Reviewed-by: Guenter Roeck <linux at roeck-us.net>

> ---
>  drivers/watchdog/stmp3xxx_rtc_wdt.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c
> index 7caf3aa71c6a..4b2caa9807ac 100644
> --- a/drivers/watchdog/stmp3xxx_rtc_wdt.c
> +++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c
> @@ -109,10 +109,9 @@ static int stmp3xxx_wdt_probe(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static int stmp3xxx_wdt_remove(struct platform_device *pdev)
> +static void stmp3xxx_wdt_remove(struct platform_device *pdev)
>  {
>  	unregister_reboot_notifier(&wdt_notifier);
> -	return 0;
>  }
>  
>  static int __maybe_unused stmp3xxx_wdt_suspend(struct device *dev)
> @@ -144,7 +143,7 @@ static struct platform_driver stmp3xxx_wdt_driver = {
>  		.pm = &stmp3xxx_wdt_pm_ops,
>  	},
>  	.probe = stmp3xxx_wdt_probe,
> -	.remove = stmp3xxx_wdt_remove,
> +	.remove_new = stmp3xxx_wdt_remove,
>  };
>  module_platform_driver(stmp3xxx_wdt_driver);
>  
> -- 
> 2.39.1
> 



More information about the linux-arm-kernel mailing list