Skip to content

L
linux
Commit 74a5b94b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Arnd Bergmann
Browse files
Options

ARM: Convert to platform remove callback returning void 

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.
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: Shawn Guo <shawnguo@kernel.org> # for imx/mmdc
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230314103225.2787101-1-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent eeac8ede
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 30 deletions
arch/arm/common/locomo.c
View file @ 74a5b94b
...@@ -494,7 +494,7 @@ static int locomo_probe(struct platform_device *dev) ...@@ -494,7 +494,7 @@ static int locomo_probe(struct platform_device *dev)
return __locomo_probe(&dev->dev, mem, irq); return __locomo_probe(&dev->dev, mem, irq);
} }
static int locomo_remove(struct platform_device *dev) static void locomo_remove(struct platform_device *dev)
{ {
struct locomo *lchip = platform_get_drvdata(dev); struct locomo *lchip = platform_get_drvdata(dev);
...@@ -502,8 +502,6 @@ static int locomo_remove(struct platform_device *dev) ...@@ -502,8 +502,6 @@ static int locomo_remove(struct platform_device *dev)
__locomo_remove(lchip); __locomo_remove(lchip);
platform_set_drvdata(dev, NULL); platform_set_drvdata(dev, NULL);
} }
return 0;
} }
/* /*
...@@ -514,7 +512,7 @@ static int locomo_remove(struct platform_device *dev) ...@@ -514,7 +512,7 @@ static int locomo_remove(struct platform_device *dev)
*/ */
static struct platform_driver locomo_device_driver = { static struct platform_driver locomo_device_driver = {
.probe = locomo_probe, .probe = locomo_probe,
.remove = locomo_remove, .remove_new = locomo_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = locomo_suspend, .suspend = locomo_suspend,
.resume = locomo_resume, .resume = locomo_resume,
......
arch/arm/common/sa1111.c
View file @ 74a5b94b
...@@ -1123,7 +1123,7 @@ static int sa1111_probe(struct platform_device *pdev) ...@@ -1123,7 +1123,7 @@ static int sa1111_probe(struct platform_device *pdev)
return __sa1111_probe(&pdev->dev, mem, irq); return __sa1111_probe(&pdev->dev, mem, irq);
} }
static int sa1111_remove(struct platform_device *pdev) static void sa1111_remove(struct platform_device *pdev)
{ {
struct sa1111 *sachip = platform_get_drvdata(pdev); struct sa1111 *sachip = platform_get_drvdata(pdev);
...@@ -1135,8 +1135,6 @@ static int sa1111_remove(struct platform_device *pdev) ...@@ -1135,8 +1135,6 @@ static int sa1111_remove(struct platform_device *pdev)
__sa1111_remove(sachip); __sa1111_remove(sachip);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
} }
return 0;
} }
static struct dev_pm_ops sa1111_pm_ops = { static struct dev_pm_ops sa1111_pm_ops = {
...@@ -1155,7 +1153,7 @@ static struct dev_pm_ops sa1111_pm_ops = { ...@@ -1155,7 +1153,7 @@ static struct dev_pm_ops sa1111_pm_ops = {
*/ */
static struct platform_driver sa1111_device_driver = { static struct platform_driver sa1111_device_driver = {
.probe = sa1111_probe, .probe = sa1111_probe,
.remove = sa1111_remove, .remove_new = sa1111_remove,
.driver = { .driver = {
.name = "sa1111", .name = "sa1111",
.pm = &sa1111_pm_ops, .pm = &sa1111_pm_ops,
......
arch/arm/common/scoop.c
View file @ 74a5b94b
...@@ -236,7 +236,7 @@ static int scoop_probe(struct platform_device *pdev) ...@@ -236,7 +236,7 @@ static int scoop_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int scoop_remove(struct platform_device *pdev) static void scoop_remove(struct platform_device *pdev)
{ {
struct scoop_dev *sdev = platform_get_drvdata(pdev); struct scoop_dev *sdev = platform_get_drvdata(pdev);
...@@ -246,13 +246,11 @@ static int scoop_remove(struct platform_device *pdev) ...@@ -246,13 +246,11 @@ static int scoop_remove(struct platform_device *pdev)
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
iounmap(sdev->base); iounmap(sdev->base);
kfree(sdev); kfree(sdev);
return 0;
} }
static struct platform_driver scoop_driver = { static struct platform_driver scoop_driver = {
.probe = scoop_probe, .probe = scoop_probe,
.remove = scoop_remove, .remove_new = scoop_remove,
.suspend = scoop_suspend, .suspend = scoop_suspend,
.resume = scoop_resume, .resume = scoop_resume,
.driver = { .driver = {
......
arch/arm/mach-imx/mmdc.c
View file @ 74a5b94b
...@@ -456,7 +456,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc, ...@@ -456,7 +456,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc,
return pmu_mmdc->id; return pmu_mmdc->id;
} }
static int imx_mmdc_remove(struct platform_device *pdev) static void imx_mmdc_remove(struct platform_device *pdev)
{ {
struct mmdc_pmu *pmu_mmdc = platform_get_drvdata(pdev); struct mmdc_pmu *pmu_mmdc = platform_get_drvdata(pdev);
...@@ -466,7 +466,6 @@ static int imx_mmdc_remove(struct platform_device *pdev) ...@@ -466,7 +466,6 @@ static int imx_mmdc_remove(struct platform_device *pdev)
iounmap(pmu_mmdc->mmdc_base); iounmap(pmu_mmdc->mmdc_base);
clk_disable_unprepare(pmu_mmdc->mmdc_ipg_clk); clk_disable_unprepare(pmu_mmdc->mmdc_ipg_clk);
kfree(pmu_mmdc); kfree(pmu_mmdc);
return 0;
} }
static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_base, static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_base,
...@@ -592,7 +591,7 @@ static struct platform_driver imx_mmdc_driver = { ...@@ -592,7 +591,7 @@ static struct platform_driver imx_mmdc_driver = {
.of_match_table = imx_mmdc_dt_ids, .of_match_table = imx_mmdc_dt_ids,
}, },
.probe = imx_mmdc_probe, .probe = imx_mmdc_probe,
.remove = imx_mmdc_remove, .remove_new = imx_mmdc_remove,
}; };
static int __init imx_mmdc_init(void) static int __init imx_mmdc_init(void)
......
arch/arm/mach-omap1/omap-dma.c
View file @ 74a5b94b
...@@ -833,7 +833,7 @@ static int omap_system_dma_probe(struct platform_device *pdev) ...@@ -833,7 +833,7 @@ static int omap_system_dma_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int omap_system_dma_remove(struct platform_device *pdev) static void omap_system_dma_remove(struct platform_device *pdev)
{ {
int dma_irq, irq_rel = 0; int dma_irq, irq_rel = 0;
...@@ -841,13 +841,11 @@ static int omap_system_dma_remove(struct platform_device *pdev) ...@@ -841,13 +841,11 @@ static int omap_system_dma_remove(struct platform_device *pdev)
dma_irq = platform_get_irq(pdev, irq_rel); dma_irq = platform_get_irq(pdev, irq_rel);
free_irq(dma_irq, (void *)(irq_rel + 1)); free_irq(dma_irq, (void *)(irq_rel + 1));
} }
return 0;
} }
static struct platform_driver omap_system_dma_driver = { static struct platform_driver omap_system_dma_driver = {
.probe = omap_system_dma_probe, .probe = omap_system_dma_probe,
.remove = omap_system_dma_remove, .remove_new = omap_system_dma_remove,
.driver = { .driver = {
.name = "omap_dma_system" .name = "omap_dma_system"
}, },
......
arch/arm/mach-pxa/sharpsl_pm.c
View file @ 74a5b94b
...@@ -890,7 +890,7 @@ static int sharpsl_pm_probe(struct platform_device *pdev) ...@@ -890,7 +890,7 @@ static int sharpsl_pm_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int sharpsl_pm_remove(struct platform_device *pdev) static void sharpsl_pm_remove(struct platform_device *pdev)
{ {
suspend_set_ops(NULL); suspend_set_ops(NULL);
...@@ -917,13 +917,11 @@ static int sharpsl_pm_remove(struct platform_device *pdev) ...@@ -917,13 +917,11 @@ static int sharpsl_pm_remove(struct platform_device *pdev)
del_timer_sync(&sharpsl_pm.chrg_full_timer); del_timer_sync(&sharpsl_pm.chrg_full_timer);
del_timer_sync(&sharpsl_pm.ac_timer); del_timer_sync(&sharpsl_pm.ac_timer);
return 0;
} }
static struct platform_driver sharpsl_pm_driver = { static struct platform_driver sharpsl_pm_driver = {
.probe = sharpsl_pm_probe, .probe = sharpsl_pm_probe,
.remove = sharpsl_pm_remove, .remove_new = sharpsl_pm_remove,
.suspend = sharpsl_pm_suspend, .suspend = sharpsl_pm_suspend,
.resume = sharpsl_pm_resume, .resume = sharpsl_pm_resume,
.driver = { .driver = {
......
arch/arm/mach-sa1100/jornada720_ssp.c
View file @ 74a5b94b
...@@ -175,18 +175,17 @@ static int jornada_ssp_probe(struct platform_device *dev) ...@@ -175,18 +175,17 @@ static int jornada_ssp_probe(struct platform_device *dev)
return 0; return 0;
}; };
static int jornada_ssp_remove(struct platform_device *dev) static void jornada_ssp_remove(struct platform_device *dev)
{ {
/* Note that this doesn't actually remove the driver, since theres nothing to remove /* Note that this doesn't actually remove the driver, since theres nothing to remove
* It just makes sure everything is turned off */ * It just makes sure everything is turned off */
GPSR = GPIO_GPIO25; GPSR = GPIO_GPIO25;
ssp_exit(); ssp_exit();
return 0;
}; };
struct platform_driver jornadassp_driver = { struct platform_driver jornadassp_driver = {
.probe = jornada_ssp_probe, .probe = jornada_ssp_probe,
.remove = jornada_ssp_remove, .remove_new = jornada_ssp_remove,
.driver = { .driver = {
.name = "jornada_ssp", .name = "jornada_ssp",
}, },
......
arch/arm/mach-sa1100/neponset.c
View file @ 74a5b94b
...@@ -376,7 +376,7 @@ static int neponset_probe(struct platform_device *dev) ...@@ -376,7 +376,7 @@ static int neponset_probe(struct platform_device *dev)
return ret; return ret;
} }
static int neponset_remove(struct platform_device *dev) static void neponset_remove(struct platform_device *dev)
{ {
struct neponset_drvdata *d = platform_get_drvdata(dev); struct neponset_drvdata *d = platform_get_drvdata(dev);
int irq = platform_get_irq(dev, 0); int irq = platform_get_irq(dev, 0);
...@@ -395,8 +395,6 @@ static int neponset_remove(struct platform_device *dev) ...@@ -395,8 +395,6 @@ static int neponset_remove(struct platform_device *dev)
nep = NULL; nep = NULL;
iounmap(d->base); iounmap(d->base);
kfree(d); kfree(d);
return 0;
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
...@@ -425,7 +423,7 @@ static const struct dev_pm_ops neponset_pm_ops = { ...@@ -425,7 +423,7 @@ static const struct dev_pm_ops neponset_pm_ops = {
static struct platform_driver neponset_device_driver = { static struct platform_driver neponset_device_driver = {
.probe = neponset_probe, .probe = neponset_probe,
.remove = neponset_remove, .remove_new = neponset_remove,
.driver = { .driver = {
.name = "neponset", .name = "neponset",
.pm = PM_OPS, .pm = PM_OPS,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7