| Message ID | 20230303213716.2123717-6-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: Convert to platform remove callback returning void | expand |
On Fri, Mar 03, 2023 at 10:36:47PM +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@pengutronix.de> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/at91rm9200_wdt.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c > index d57409c1a4d1..d20ec27ba354 100644 > --- a/drivers/watchdog/at91rm9200_wdt.c > +++ b/drivers/watchdog/at91rm9200_wdt.c > @@ -258,7 +258,7 @@ static int at91wdt_probe(struct platform_device *pdev) > return 0; > } > > -static int at91wdt_remove(struct platform_device *pdev) > +static void at91wdt_remove(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > int res; > @@ -269,8 +269,6 @@ static int at91wdt_remove(struct platform_device *pdev) > > misc_deregister(&at91wdt_miscdev); > at91wdt_miscdev.parent = NULL; > - > - return 0; > } > > static void at91wdt_shutdown(struct platform_device *pdev) > @@ -299,7 +297,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); > > static struct platform_driver at91wdt_driver = { > .probe = at91wdt_probe, > - .remove = at91wdt_remove, > + .remove_new = at91wdt_remove, > .shutdown = at91wdt_shutdown, > .suspend = pm_ptr(at91wdt_suspend), > .resume = pm_ptr(at91wdt_resume), > -- > 2.39.1 >
On 03.03.2023 23:36, Uwe Kleine-König wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 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@pengutronix.de> Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> > --- > drivers/watchdog/at91rm9200_wdt.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c > index d57409c1a4d1..d20ec27ba354 100644 > --- a/drivers/watchdog/at91rm9200_wdt.c > +++ b/drivers/watchdog/at91rm9200_wdt.c > @@ -258,7 +258,7 @@ static int at91wdt_probe(struct platform_device *pdev) > return 0; > } > > -static int at91wdt_remove(struct platform_device *pdev) > +static void at91wdt_remove(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > int res; > @@ -269,8 +269,6 @@ static int at91wdt_remove(struct platform_device *pdev) > > misc_deregister(&at91wdt_miscdev); > at91wdt_miscdev.parent = NULL; > - > - return 0; > } > > static void at91wdt_shutdown(struct platform_device *pdev) > @@ -299,7 +297,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); > > static struct platform_driver at91wdt_driver = { > .probe = at91wdt_probe, > - .remove = at91wdt_remove, > + .remove_new = at91wdt_remove, > .shutdown = at91wdt_shutdown, > .suspend = pm_ptr(at91wdt_suspend), > .resume = pm_ptr(at91wdt_resume), > -- > 2.39.1 >
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index d57409c1a4d1..d20ec27ba354 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c @@ -258,7 +258,7 @@ static int at91wdt_probe(struct platform_device *pdev) return 0; } -static int at91wdt_remove(struct platform_device *pdev) +static void at91wdt_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; int res; @@ -269,8 +269,6 @@ static int at91wdt_remove(struct platform_device *pdev) misc_deregister(&at91wdt_miscdev); at91wdt_miscdev.parent = NULL; - - return 0; } static void at91wdt_shutdown(struct platform_device *pdev) @@ -299,7 +297,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); static struct platform_driver at91wdt_driver = { .probe = at91wdt_probe, - .remove = at91wdt_remove, + .remove_new = at91wdt_remove, .shutdown = at91wdt_shutdown, .suspend = pm_ptr(at91wdt_suspend), .resume = pm_ptr(at91wdt_resume),
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@pengutronix.de> --- drivers/watchdog/at91rm9200_wdt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)