On Fri, Mar 03, 2023 at 10:37:02PM +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/omap_wdt.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
> index e75aa86f63cb..a7a12f2fe9de 100644
> --- a/drivers/watchdog/omap_wdt.c
> +++ b/drivers/watchdog/omap_wdt.c
> @@ -306,14 +306,12 @@ static void omap_wdt_shutdown(struct platform_device *pdev)
> mutex_unlock(&wdev->lock);
> }
>
> -static int omap_wdt_remove(struct platform_device *pdev)
> +static void omap_wdt_remove(struct platform_device *pdev)
> {
> struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
>
> pm_runtime_disable(wdev->dev);
> watchdog_unregister_device(&wdev->wdog);
> -
> - return 0;
> }
>
> /* REVISIT ... not clear this is the best way to handle system suspend; and
> @@ -359,7 +357,7 @@ MODULE_DEVICE_TABLE(of, omap_wdt_of_match);
>
> static struct platform_driver omap_wdt_driver = {
> .probe = omap_wdt_probe,
> - .remove = omap_wdt_remove,
> + .remove_new = omap_wdt_remove,
> .shutdown = omap_wdt_shutdown,
> .suspend = pm_ptr(omap_wdt_suspend),
> .resume = pm_ptr(omap_wdt_resume),
> --
> 2.39.1
>
