On Fri, Mar 03, 2023 at 10:36:46PM +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/ar7_wdt.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
> index 743e171d97a3..cdcaeb0961ac 100644
> --- a/drivers/watchdog/ar7_wdt.c
> +++ b/drivers/watchdog/ar7_wdt.c
> @@ -290,12 +290,11 @@ static int ar7_wdt_probe(struct platform_device *pdev)
> return rc;
> }
>
> -static int ar7_wdt_remove(struct platform_device *pdev)
> +static void ar7_wdt_remove(struct platform_device *pdev)
> {
> misc_deregister(&ar7_wdt_miscdev);
> clk_put(vbus_clk);
> vbus_clk = NULL;
> - return 0;
> }
>
> static void ar7_wdt_shutdown(struct platform_device *pdev)
> @@ -306,7 +305,7 @@ static void ar7_wdt_shutdown(struct platform_device *pdev)
>
> static struct platform_driver ar7_wdt_driver = {
> .probe = ar7_wdt_probe,
> - .remove = ar7_wdt_remove,
> + .remove_new = ar7_wdt_remove,
> .shutdown = ar7_wdt_shutdown,
> .driver = {
> .name = "ar7_wdt",
> --
> 2.39.1
>
