| Message ID | 20230919133207.1400430-12-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 67572bfe2e35c232c3497b3fc8babbfe62600ce0 |
| Headers | show |
| Series | dma: Convert to platform remove callback returning void | expand |
On 19-09-23, 15:31, 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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/dma/dw/platform.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c > index 47f2292dba98..7d9d4c951724 100644 > --- a/drivers/dma/dw/platform.c > +++ b/drivers/dma/dw/platform.c > @@ -93,7 +93,7 @@ static int dw_probe(struct platform_device *pdev) > return err; > } > > -static int dw_remove(struct platform_device *pdev) > +static void dw_remove(struct platform_device *pdev) > { > struct dw_dma_chip_pdata *data = platform_get_drvdata(pdev); > struct dw_dma_chip *chip = data->chip; > @@ -109,8 +109,6 @@ static int dw_remove(struct platform_device *pdev) > > pm_runtime_disable(&pdev->dev); > clk_disable_unprepare(chip->clk); > - > - return 0; > } > > static void dw_shutdown(struct platform_device *pdev) > @@ -193,7 +191,7 @@ static const struct dev_pm_ops dw_dev_pm_ops = { > > static struct platform_driver dw_driver = { > .probe = dw_probe, > - .remove = dw_remove, > + .remove_new = dw_remove, > .shutdown = dw_shutdown, > .driver = { > .name = DRV_NAME, Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c index 47f2292dba98..7d9d4c951724 100644 --- a/drivers/dma/dw/platform.c +++ b/drivers/dma/dw/platform.c @@ -93,7 +93,7 @@ static int dw_probe(struct platform_device *pdev) return err; } -static int dw_remove(struct platform_device *pdev) +static void dw_remove(struct platform_device *pdev) { struct dw_dma_chip_pdata *data = platform_get_drvdata(pdev); struct dw_dma_chip *chip = data->chip; @@ -109,8 +109,6 @@ static int dw_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); clk_disable_unprepare(chip->clk); - - return 0; } static void dw_shutdown(struct platform_device *pdev) @@ -193,7 +191,7 @@ static const struct dev_pm_ops dw_dev_pm_ops = { static struct platform_driver dw_driver = { .probe = dw_probe, - .remove = dw_remove, + .remove_new = dw_remove, .shutdown = dw_shutdown, .driver = { .name = DRV_NAME,
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/dw/platform.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)