On Fri, Mar 03, 2023 at 10:36:59PM +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/mtx-1_wdt.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
> index ea1bbf5ee528..152e41ecbb14 100644
> --- a/drivers/watchdog/mtx-1_wdt.c
> +++ b/drivers/watchdog/mtx-1_wdt.c
> @@ -221,7 +221,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
> return 0;
> }
>
> -static int mtx1_wdt_remove(struct platform_device *pdev)
> +static void mtx1_wdt_remove(struct platform_device *pdev)
> {
> /* FIXME: do we need to lock this test ? */
> if (mtx1_wdt_device.queue) {
> @@ -230,12 +230,11 @@ static int mtx1_wdt_remove(struct platform_device *pdev)
> }
>
> misc_deregister(&mtx1_wdt_misc);
> - return 0;
> }
>
> static struct platform_driver mtx1_wdt_driver = {
> .probe = mtx1_wdt_probe,
> - .remove = mtx1_wdt_remove,
> + .remove_new = mtx1_wdt_remove,
> .driver.name = "mtx1-wdt",
> .driver.owner = THIS_MODULE,
> };
> --
> 2.39.1
>
