On Fri, Mar 03, 2023 at 10:36:58PM +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/lpc18xx_wdt.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c
> index 1b9b5f21a0df..19535f4a2fd2 100644
> --- a/drivers/watchdog/lpc18xx_wdt.c
> +++ b/drivers/watchdog/lpc18xx_wdt.c
> @@ -261,14 +261,12 @@ static int lpc18xx_wdt_probe(struct platform_device *pdev)
> return devm_watchdog_register_device(dev, &lpc18xx_wdt->wdt_dev);
> }
>
> -static int lpc18xx_wdt_remove(struct platform_device *pdev)
> +static void lpc18xx_wdt_remove(struct platform_device *pdev)
> {
> struct lpc18xx_wdt_dev *lpc18xx_wdt = platform_get_drvdata(pdev);
>
> dev_warn(&pdev->dev, "I quit now, hardware will probably reboot!\n");
> del_timer_sync(&lpc18xx_wdt->timer);
> -
> - return 0;
> }
>
> static const struct of_device_id lpc18xx_wdt_match[] = {
> @@ -283,7 +281,7 @@ static struct platform_driver lpc18xx_wdt_driver = {
> .of_match_table = lpc18xx_wdt_match,
> },
> .probe = lpc18xx_wdt_probe,
> - .remove = lpc18xx_wdt_remove,
> + .remove_new = lpc18xx_wdt_remove,
> };
> module_platform_driver(lpc18xx_wdt_driver);
>
> --
> 2.39.1
>
