On Fri, Mar 03, 2023 at 10:37:12PM +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>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/sch311x_wdt.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
> index d8b77fe10eba..409d49880170 100644
> --- a/drivers/watchdog/sch311x_wdt.c
> +++ b/drivers/watchdog/sch311x_wdt.c
> @@ -425,7 +425,7 @@ static int sch311x_wdt_probe(struct platform_device *pdev)
> return err;
> }
>
> -static int sch311x_wdt_remove(struct platform_device *pdev)
> +static void sch311x_wdt_remove(struct platform_device *pdev)
> {
> /* Stop the timer before we leave */
> if (!nowayout)
> @@ -436,7 +436,6 @@ static int sch311x_wdt_remove(struct platform_device *pdev)
> release_region(sch311x_wdt_data.runtime_reg + WDT_TIME_OUT, 4);
> release_region(sch311x_wdt_data.runtime_reg + GP60, 1);
> sch311x_wdt_data.runtime_reg = 0;
> - return 0;
> }
>
> static void sch311x_wdt_shutdown(struct platform_device *dev)
> @@ -447,7 +446,7 @@ static void sch311x_wdt_shutdown(struct platform_device *dev)
>
> static struct platform_driver sch311x_wdt_driver = {
> .probe = sch311x_wdt_probe,
> - .remove = sch311x_wdt_remove,
> + .remove_new = sch311x_wdt_remove,
> .shutdown = sch311x_wdt_shutdown,
> .driver = {
> .name = DRV_NAME,
> --
> 2.39.1
>
