| Message ID | 20230403154014.2564054-8-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: Convert to platform remove callback returning void | expand |
On 03/04/2023 at 17:39, 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> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> > --- > drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c > index 01ababdfcbd9..315bfc4ac4ff 100644 > --- a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c > +++ b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c > @@ -549,7 +549,7 @@ static int microchip_xisc_probe(struct platform_device *pdev) > return ret; > } > > -static int microchip_xisc_remove(struct platform_device *pdev) > +static void microchip_xisc_remove(struct platform_device *pdev) > { > struct isc_device *isc = platform_get_drvdata(pdev); > > @@ -562,8 +562,6 @@ static int microchip_xisc_remove(struct platform_device *pdev) > clk_disable_unprepare(isc->hclock); > > atmel_isc_clk_cleanup(isc); > - > - return 0; > } > > static int __maybe_unused xisc_runtime_suspend(struct device *dev) > @@ -601,7 +599,7 @@ MODULE_DEVICE_TABLE(of, microchip_xisc_of_match); > > static struct platform_driver microchip_xisc_driver = { > .probe = microchip_xisc_probe, > - .remove = microchip_xisc_remove, > + .remove_new = microchip_xisc_remove, > .driver = { > .name = "microchip-sama7g5-xisc", > .pm = µchip_xisc_dev_pm_ops, > -- > 2.39.2 >
diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c index 01ababdfcbd9..315bfc4ac4ff 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c +++ b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c @@ -549,7 +549,7 @@ static int microchip_xisc_probe(struct platform_device *pdev) return ret; } -static int microchip_xisc_remove(struct platform_device *pdev) +static void microchip_xisc_remove(struct platform_device *pdev) { struct isc_device *isc = platform_get_drvdata(pdev); @@ -562,8 +562,6 @@ static int microchip_xisc_remove(struct platform_device *pdev) clk_disable_unprepare(isc->hclock); atmel_isc_clk_cleanup(isc); - - return 0; } static int __maybe_unused xisc_runtime_suspend(struct device *dev) @@ -601,7 +599,7 @@ MODULE_DEVICE_TABLE(of, microchip_xisc_of_match); static struct platform_driver microchip_xisc_driver = { .probe = microchip_xisc_probe, - .remove = microchip_xisc_remove, + .remove_new = microchip_xisc_remove, .driver = { .name = "microchip-sama7g5-xisc", .pm = µchip_xisc_dev_pm_ops,
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/staging/media/deprecated/atmel/atmel-sama7g5-isc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)