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

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.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent eeac8ede

arch/arm/common/locomo.c

+2 −4
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int locomo_probe(struct platform_device *dev) 
	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);
@@ -502,8 +502,6 @@ static int locomo_remove(struct platform_device *dev) 
		__locomo_remove(lchip);

		platform_set_drvdata(dev, NULL);

	}



	return 0;

}



/*
@@ -514,7 +512,7 @@ static int locomo_remove(struct platform_device *dev) 
 */

static struct platform_driver locomo_device_driver = {

	.probe		= locomo_probe,

	.remove		= locomo_remove,

	.remove_new	= locomo_remove,

#ifdef CONFIG_PM

	.suspend	= locomo_suspend,

	.resume		= locomo_resume,

arch/arm/common/sa1111.c

+2 −4
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ static int sa1111_probe(struct platform_device *pdev) 
	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);
@@ -1135,8 +1135,6 @@ static int sa1111_remove(struct platform_device *pdev) 
		__sa1111_remove(sachip);

		platform_set_drvdata(pdev, NULL);

	}



	return 0;

}



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 = {

	.probe		= sa1111_probe,

	.remove		= sa1111_remove,

	.remove_new	= sa1111_remove,

	.driver		= {

		.name	= "sa1111",

		.pm	= &sa1111_pm_ops,

arch/arm/common/scoop.c

+2 −4
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int scoop_probe(struct platform_device *pdev) 
	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);
@@ -246,13 +246,11 @@ static int scoop_remove(struct platform_device *pdev) 
	platform_set_drvdata(pdev, NULL);

	iounmap(sdev->base);

	kfree(sdev);



	return 0;

}



static struct platform_driver scoop_driver = {

	.probe		= scoop_probe,

	.remove		= scoop_remove,

	.remove_new	= scoop_remove,

	.suspend	= scoop_suspend,

	.resume		= scoop_resume,

	.driver		= {

arch/arm/mach-imx/mmdc.c

+2 −3
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc, 
	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);
@@ -466,7 +466,6 @@ static int imx_mmdc_remove(struct platform_device *pdev) 
	iounmap(pmu_mmdc->mmdc_base);

	clk_disable_unprepare(pmu_mmdc->mmdc_ipg_clk);

	kfree(pmu_mmdc);

	return 0;

}



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 = { 
		.of_match_table = imx_mmdc_dt_ids,

	},

	.probe		= imx_mmdc_probe,

	.remove		= imx_mmdc_remove,

	.remove_new	= imx_mmdc_remove,

};



static int __init imx_mmdc_init(void)

arch/arm/mach-omap1/omap-dma.c

+2 −4
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ static int omap_system_dma_probe(struct platform_device *pdev) 
	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;
@@ -841,13 +841,11 @@ static int omap_system_dma_remove(struct platform_device *pdev) 
		dma_irq = platform_get_irq(pdev, irq_rel);

		free_irq(dma_irq, (void *)(irq_rel + 1));

	}



	return 0;

}



static struct platform_driver omap_system_dma_driver = {

	.probe		= omap_system_dma_probe,

	.remove		= omap_system_dma_remove,

	.remove_new	= omap_system_dma_remove,

	.driver		= {

		.name	= "omap_dma_system"

	},