[PATCH 32/34] watchdog: st_lpc: Convert to platform remove callback returning void

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


On Fri, Mar 03, 2023 at 10:37:14PM +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/st_lpc_wdt.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
> index 39abecdb9dd1..d2aa43c00221 100644
> --- a/drivers/watchdog/st_lpc_wdt.c
> +++ b/drivers/watchdog/st_lpc_wdt.c
> @@ -239,13 +239,11 @@ static int st_wdog_probe(struct platform_device *pdev)
>  	return ret;
>  }
>  
> -static int st_wdog_remove(struct platform_device *pdev)
> +static void st_wdog_remove(struct platform_device *pdev)
>  {
>  	struct st_wdog *st_wdog = watchdog_get_drvdata(&st_wdog_dev);
>  
>  	st_wdog_setup(st_wdog, false);
> -
> -	return 0;
>  }
>  
>  static int st_wdog_suspend(struct device *dev)
> @@ -295,7 +293,7 @@ static struct platform_driver st_wdog_driver = {
>  		.of_match_table = st_wdog_match,
>  	},
>  	.probe = st_wdog_probe,
> -	.remove = st_wdog_remove,
> +	.remove_new = st_wdog_remove,
>  };
>  module_platform_driver(st_wdog_driver);
>  
> -- 
> 2.39.1
> 



More information about the linux-arm-kernel mailing list