On Fri, Mar 03, 2023 at 10:36:52PM +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/cpwd.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
> index 1eafe0b4d71c..47250f9b68c7 100644
> --- a/drivers/watchdog/cpwd.c
> +++ b/drivers/watchdog/cpwd.c
> @@ -614,7 +614,7 @@ static int cpwd_probe(struct platform_device *op)
> return err;
> }
>
> -static int cpwd_remove(struct platform_device *op)
> +static void cpwd_remove(struct platform_device *op)
> {
> struct cpwd *p = platform_get_drvdata(op);
> int i;
> @@ -638,8 +638,6 @@ static int cpwd_remove(struct platform_device *op)
> of_iounmap(&op->resource[0], p->regs, 4 * WD_TIMER_REGSZ);
>
> cpwd_device = NULL;
> -
> - return 0;
> }
>
> static const struct of_device_id cpwd_match[] = {
> @@ -656,7 +654,7 @@ static struct platform_driver cpwd_driver = {
> .of_match_table = cpwd_match,
> },
> .probe = cpwd_probe,
> - .remove = cpwd_remove,
> + .remove_new = cpwd_remove,
> };
>
> module_platform_driver(cpwd_driver);
> --
> 2.39.1
>
