On Fri, Mar 03, 2023 at 10:37:09PM +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/rti_wdt.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
> index 6e9253761fc1..ce8f18e93aa9 100644
> --- a/drivers/watchdog/rti_wdt.c
> +++ b/drivers/watchdog/rti_wdt.c
> @@ -304,15 +304,13 @@ static int rti_wdt_probe(struct platform_device *pdev)
> return ret;
> }
>
> -static int rti_wdt_remove(struct platform_device *pdev)
> +static void rti_wdt_remove(struct platform_device *pdev)
> {
> struct rti_wdt_device *wdt = platform_get_drvdata(pdev);
>
> watchdog_unregister_device(&wdt->wdd);
> pm_runtime_put(&pdev->dev);
> pm_runtime_disable(&pdev->dev);
> -
> - return 0;
> }
>
> static const struct of_device_id rti_wdt_of_match[] = {
> @@ -327,7 +325,7 @@ static struct platform_driver rti_wdt_driver = {
> .of_match_table = rti_wdt_of_match,
> },
> .probe = rti_wdt_probe,
> - .remove = rti_wdt_remove,
> + .remove_new = rti_wdt_remove,
> };
>
> module_platform_driver(rti_wdt_driver);
> --
> 2.39.1
>
