Skip to content
/ linux Public

Commit 592833e

Browse files
Uwe Kleine-KönigSasha Levin
authored andcommitted
dmaengine: fsl-edma-main: Convert to platform remove callback returning void
[ Upstream commit fa13c3e ] 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> Link: https://lore.kernel.org/r/20230919133207.1400430-13-u.kleine-koenig@pengutronix.de Signed-off-by: Vinod Koul <vkoul@kernel.org> Stable-dep-of: 666c53e ("dmaengine: fsl-edma: don't explicitly disable clocks in .remove()") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent a489f1f commit 592833e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/dma/fsl-edma-main.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ static int fsl_edma_probe(struct platform_device *pdev)
669669
return 0;
670670
}
671671

672-
static int fsl_edma_remove(struct platform_device *pdev)
672+
static void fsl_edma_remove(struct platform_device *pdev)
673673
{
674674
struct device_node *np = pdev->dev.of_node;
675675
struct fsl_edma_engine *fsl_edma = platform_get_drvdata(pdev);
@@ -679,8 +679,6 @@ static int fsl_edma_remove(struct platform_device *pdev)
679679
dma_async_device_unregister(&fsl_edma->dma_dev);
680680
fsl_edma_cleanup_vchan(&fsl_edma->dma_dev);
681681
fsl_disable_clocks(fsl_edma, fsl_edma->drvdata->dmamuxs);
682-
683-
return 0;
684682
}
685683

686684
static int fsl_edma_suspend_late(struct device *dev)
@@ -749,7 +747,7 @@ static struct platform_driver fsl_edma_driver = {
749747
.pm = &fsl_edma_pm_ops,
750748
},
751749
.probe = fsl_edma_probe,
752-
.remove = fsl_edma_remove,
750+
.remove_new = fsl_edma_remove,
753751
};
754752

755753
static int __init fsl_edma_init(void)

0 commit comments

Comments
 (0)