On Fri, Mar 03, 2023 at 10:36:53PM +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/dw_wdt.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
> index 462f15bd5ffa..6f88bd81f8a1 100644
> --- a/drivers/watchdog/dw_wdt.c
> +++ b/drivers/watchdog/dw_wdt.c
> @@ -681,7 +681,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
> return ret;
> }
>
> -static int dw_wdt_drv_remove(struct platform_device *pdev)
> +static void dw_wdt_drv_remove(struct platform_device *pdev)
> {
> struct dw_wdt *dw_wdt = platform_get_drvdata(pdev);
>
> @@ -691,8 +691,6 @@ static int dw_wdt_drv_remove(struct platform_device *pdev)
> reset_control_assert(dw_wdt->rst);
> clk_disable_unprepare(dw_wdt->pclk);
> clk_disable_unprepare(dw_wdt->clk);
> -
> - return 0;
> }
>
> #ifdef CONFIG_OF
> @@ -705,7 +703,7 @@ MODULE_DEVICE_TABLE(of, dw_wdt_of_match);
>
> static struct platform_driver dw_wdt_driver = {
> .probe = dw_wdt_drv_probe,
> - .remove = dw_wdt_drv_remove,
> + .remove_new = dw_wdt_drv_remove,
> .driver = {
> .name = "dw_wdt",
> .of_match_table = of_match_ptr(dw_wdt_of_match),
> --
> 2.39.1
>
