Re: [PATCH 18/34] watchdog: nic7018: Convert to platform remove callback returning void

[Guenter Roeck <linux@roeck-us.net>]

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

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

> ---
>  drivers/watchdog/nic7018_wdt.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/watchdog/nic7018_wdt.c b/drivers/watchdog/nic7018_wdt.c
> index 2a46cc662943..c3f0a4926667 100644
> --- a/drivers/watchdog/nic7018_wdt.c
> +++ b/drivers/watchdog/nic7018_wdt.c
> @@ -218,7 +218,7 @@ static int nic7018_probe(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static int nic7018_remove(struct platform_device *pdev)
> +static void nic7018_remove(struct platform_device *pdev)
>  {
>  	struct nic7018_wdt *wdt = platform_get_drvdata(pdev);
>  
> @@ -226,8 +226,6 @@ static int nic7018_remove(struct platform_device *pdev)
>  
>  	/* Lock WDT register */
>  	outb(LOCK, wdt->io_base + WDT_REG_LOCK);
> -
> -	return 0;
>  }
>  
>  static const struct acpi_device_id nic7018_device_ids[] = {
> @@ -238,7 +236,7 @@ MODULE_DEVICE_TABLE(acpi, nic7018_device_ids);
>  
>  static struct platform_driver watchdog_driver = {
>  	.probe = nic7018_probe,
> -	.remove = nic7018_remove,
> +	.remove_new = nic7018_remove,
>  	.driver = {
>  		.name = KBUILD_MODNAME,
>  		.acpi_match_table = ACPI_PTR(nic7018_device_ids),
> -- 
> 2.39.1
>