On Fri, Mar 03, 2023 at 10:37:13PM +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/shwdt.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
> index f55533e0e045..10f1fba78ec2 100644
> --- a/drivers/watchdog/shwdt.c
> +++ b/drivers/watchdog/shwdt.c
> @@ -279,13 +279,11 @@ static int sh_wdt_probe(struct platform_device *pdev)
> return 0;
> }
>
> -static int sh_wdt_remove(struct platform_device *pdev)
> +static void sh_wdt_remove(struct platform_device *pdev)
> {
> watchdog_unregister_device(&sh_wdt_dev);
>
> pm_runtime_disable(&pdev->dev);
> -
> - return 0;
> }
>
> static void sh_wdt_shutdown(struct platform_device *pdev)
> @@ -299,7 +297,7 @@ static struct platform_driver sh_wdt_driver = {
> },
>
> .probe = sh_wdt_probe,
> - .remove = sh_wdt_remove,
> + .remove_new = sh_wdt_remove,
> .shutdown = sh_wdt_shutdown,
> };
>
> --
> 2.39.1
>
