On Fri, Mar 03, 2023 at 10:37:07PM +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/riowd.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
> index 747e346ed06c..c04b383e1712 100644
> --- a/drivers/watchdog/riowd.c
> +++ b/drivers/watchdog/riowd.c
> @@ -217,14 +217,12 @@ static int riowd_probe(struct platform_device *op)
> return err;
> }
>
> -static int riowd_remove(struct platform_device *op)
> +static void riowd_remove(struct platform_device *op)
> {
> struct riowd *p = platform_get_drvdata(op);
>
> misc_deregister(&riowd_miscdev);
> of_iounmap(&op->resource[0], p->regs, 2);
> -
> - return 0;
> }
>
> static const struct of_device_id riowd_match[] = {
> @@ -241,7 +239,7 @@ static struct platform_driver riowd_driver = {
> .of_match_table = riowd_match,
> },
> .probe = riowd_probe,
> - .remove = riowd_remove,
> + .remove_new = riowd_remove,
> };
>
> module_platform_driver(riowd_driver);
> --
> 2.39.1
>
