| Message ID | 20230919133207.1400430-53-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5ea68dc1cee00e5ecf174f2a3ef13d63520971cb |
| Headers | show |
| Series | dma: Convert to platform remove callback returning void | expand |
On 9/19/23 16:32, 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 ignored (apart > from emitting a warning) 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. Eventually after all drivers > are converted, .remove_new() is renamed to .remove(). > > Trivially convert this driver from always returning zero in the remove > callback to the void returning variant. Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/dma/ti/omap-dma.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c > index cf96cf915c0c..76db0fc19524 100644 > --- a/drivers/dma/ti/omap-dma.c > +++ b/drivers/dma/ti/omap-dma.c > @@ -1844,7 +1844,7 @@ static int omap_dma_probe(struct platform_device *pdev) > return rc; > } > > -static int omap_dma_remove(struct platform_device *pdev) > +static void omap_dma_remove(struct platform_device *pdev) > { > struct omap_dmadev *od = platform_get_drvdata(pdev); > int irq; > @@ -1869,8 +1869,6 @@ static int omap_dma_remove(struct platform_device *pdev) > dma_pool_destroy(od->desc_pool); > > omap_dma_free(od); > - > - return 0; > } > > static const struct omap_dma_config omap2420_data = { > @@ -1918,7 +1916,7 @@ MODULE_DEVICE_TABLE(of, omap_dma_match); > > static struct platform_driver omap_dma_driver = { > .probe = omap_dma_probe, > - .remove = omap_dma_remove, > + .remove_new = omap_dma_remove, > .driver = { > .name = "omap-dma-engine", > .of_match_table = omap_dma_match,
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c index cf96cf915c0c..76db0fc19524 100644 --- a/drivers/dma/ti/omap-dma.c +++ b/drivers/dma/ti/omap-dma.c @@ -1844,7 +1844,7 @@ static int omap_dma_probe(struct platform_device *pdev) return rc; } -static int omap_dma_remove(struct platform_device *pdev) +static void omap_dma_remove(struct platform_device *pdev) { struct omap_dmadev *od = platform_get_drvdata(pdev); int irq; @@ -1869,8 +1869,6 @@ static int omap_dma_remove(struct platform_device *pdev) dma_pool_destroy(od->desc_pool); omap_dma_free(od); - - return 0; } static const struct omap_dma_config omap2420_data = { @@ -1918,7 +1916,7 @@ MODULE_DEVICE_TABLE(of, omap_dma_match); static struct platform_driver omap_dma_driver = { .probe = omap_dma_probe, - .remove = omap_dma_remove, + .remove_new = omap_dma_remove, .driver = { .name = "omap-dma-engine", .of_match_table = omap_dma_match,
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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() is renamed to .remove(). 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/dma/ti/omap-dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)