[PATCH 07/34] watchdog: bcm2835: Convert to platform remove callback returning void

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


On Fri, Mar 03, 2023 at 10:36:49PM +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/bcm2835_wdt.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
> index 94907176a0e4..7a855289ff5e 100644
> --- a/drivers/watchdog/bcm2835_wdt.c
> +++ b/drivers/watchdog/bcm2835_wdt.c
> @@ -218,17 +218,15 @@ static int bcm2835_wdt_probe(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static int bcm2835_wdt_remove(struct platform_device *pdev)
> +static void bcm2835_wdt_remove(struct platform_device *pdev)
>  {
>  	if (pm_power_off == bcm2835_power_off)
>  		pm_power_off = NULL;
> -
> -	return 0;
>  }
>  
>  static struct platform_driver bcm2835_wdt_driver = {
>  	.probe		= bcm2835_wdt_probe,
> -	.remove		= bcm2835_wdt_remove,
> +	.remove_new	= bcm2835_wdt_remove,
>  	.driver = {
>  		.name =		"bcm2835-wdt",
>  	},
> -- 
> 2.39.1
> 



More information about the linux-arm-kernel mailing list