On Fri, Mar 03, 2023 at 10:37:03PM +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/orion_wdt.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
> index e25e6bf4647f..5ec2dd8fd5fa 100644
> --- a/drivers/watchdog/orion_wdt.c
> +++ b/drivers/watchdog/orion_wdt.c
> @@ -649,7 +649,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
> return ret;
> }
>
> -static int orion_wdt_remove(struct platform_device *pdev)
> +static void orion_wdt_remove(struct platform_device *pdev)
> {
> struct watchdog_device *wdt_dev = platform_get_drvdata(pdev);
> struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
> @@ -657,7 +657,6 @@ static int orion_wdt_remove(struct platform_device *pdev)
> watchdog_unregister_device(wdt_dev);
> clk_disable_unprepare(dev->clk);
> clk_put(dev->clk);
> - return 0;
> }
>
> static void orion_wdt_shutdown(struct platform_device *pdev)
> @@ -668,7 +667,7 @@ static void orion_wdt_shutdown(struct platform_device *pdev)
>
> static struct platform_driver orion_wdt_driver = {
> .probe = orion_wdt_probe,
> - .remove = orion_wdt_remove,
> + .remove_new = orion_wdt_remove,
> .shutdown = orion_wdt_shutdown,
> .driver = {
> .name = "orion_wdt",
> --
> 2.39.1
>
