drm/imx/ipuv3: Convert to platform remove callback returning void

Uwe Kleine-König · martinezjavier · commit 3095f1122203 · 2023-09-09T16:04:40.000+02:00
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 the ipuv3 imx drivers 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> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230507162616.1368908-23-u.kleine-koenig@pengutronix.de
diff --git a/drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c b/drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c
@@ -255,19 +255,17 @@ static int dw_hdmi_imx_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int dw_hdmi_imx_remove(struct platform_device *pdev)
+static void dw_hdmi_imx_remove(struct platform_device *pdev)
 {
 	struct imx_hdmi *hdmi = platform_get_drvdata(pdev);
 
 	component_del(&pdev->dev, &dw_hdmi_imx_ops);
 	dw_hdmi_remove(hdmi->hdmi);
-
-	return 0;
 }
 
 static struct platform_driver dw_hdmi_imx_platform_driver = {
 	.probe  = dw_hdmi_imx_probe,
-	.remove = dw_hdmi_imx_remove,
+	.remove_new = dw_hdmi_imx_remove,
 	.driver = {
 		.name = "dwhdmi-imx",
 		.of_match_table = dw_hdmi_imx_dt_ids,
diff --git a/drivers/gpu/drm/imx/ipuv3/imx-drm-core.c b/drivers/gpu/drm/imx/ipuv3/imx-drm-core.c
@@ -292,10 +292,9 @@ static int imx_drm_platform_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int imx_drm_platform_remove(struct platform_device *pdev)
+static void imx_drm_platform_remove(struct platform_device *pdev)
 {
 	component_master_del(&pdev->dev, &imx_drm_ops);
-	return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -324,7 +323,7 @@ MODULE_DEVICE_TABLE(of, imx_drm_dt_ids);
 
 static struct platform_driver imx_drm_pdrv = {
 	.probe		= imx_drm_platform_probe,
-	.remove		= imx_drm_platform_remove,
+	.remove_new	= imx_drm_platform_remove,
 	.driver		= {
 		.name	= "imx-drm",
 		.pm	= &imx_drm_pm_ops,
diff --git a/drivers/gpu/drm/imx/ipuv3/imx-ldb.c b/drivers/gpu/drm/imx/ipuv3/imx-ldb.c
@@ -737,7 +737,7 @@ static int imx_ldb_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int imx_ldb_remove(struct platform_device *pdev)
+static void imx_ldb_remove(struct platform_device *pdev)
 {
 	struct imx_ldb *imx_ldb = platform_get_drvdata(pdev);
 	int i;
@@ -750,12 +750,11 @@ static int imx_ldb_remove(struct platform_device *pdev)
 	}
 
 	component_del(&pdev->dev, &imx_ldb_ops);
-	return 0;
 }
 
 static struct platform_driver imx_ldb_driver = {
 	.probe		= imx_ldb_probe,
-	.remove		= imx_ldb_remove,
+	.remove_new	= imx_ldb_remove,
 	.driver		= {
 		.of_match_table = imx_ldb_dt_ids,
 		.name	= DRIVER_NAME,
diff --git a/drivers/gpu/drm/imx/ipuv3/imx-tve.c b/drivers/gpu/drm/imx/ipuv3/imx-tve.c
@@ -645,10 +645,9 @@ static int imx_tve_probe(struct platform_device *pdev)
 	return component_add(dev, &imx_tve_ops);
 }
 
-static int imx_tve_remove(struct platform_device *pdev)
+static void imx_tve_remove(struct platform_device *pdev)
 {
 	component_del(&pdev->dev, &imx_tve_ops);
-	return 0;
 }
 
 static const struct of_device_id imx_tve_dt_ids[] = {
@@ -659,7 +658,7 @@ MODULE_DEVICE_TABLE(of, imx_tve_dt_ids);
 
 static struct platform_driver imx_tve_driver = {
 	.probe		= imx_tve_probe,
-	.remove		= imx_tve_remove,
+	.remove_new	= imx_tve_remove,
 	.driver		= {
 		.of_match_table = imx_tve_dt_ids,
 		.name	= "imx-tve",
diff --git a/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c
@@ -441,16 +441,15 @@ static int ipu_drm_probe(struct platform_device *pdev)
 	return component_add(dev, &ipu_crtc_ops);
 }
 
-static int ipu_drm_remove(struct platform_device *pdev)
+static void ipu_drm_remove(struct platform_device *pdev)
 {
 	component_del(&pdev->dev, &ipu_crtc_ops);
-	return 0;
 }
 
 struct platform_driver ipu_drm_driver = {
 	.driver = {
 		.name = "imx-ipuv3-crtc",
 	},
 	.probe = ipu_drm_probe,
-	.remove = ipu_drm_remove,
+	.remove_new = ipu_drm_remove,
 };
diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
@@ -353,11 +353,9 @@ static int imx_pd_probe(struct platform_device *pdev)
 	return component_add(dev, &imx_pd_ops);
 }
 
-static int imx_pd_remove(struct platform_device *pdev)
+static void imx_pd_remove(struct platform_device *pdev)
 {
 	component_del(&pdev->dev, &imx_pd_ops);
-
-	return 0;
 }
 
 static const struct of_device_id imx_pd_dt_ids[] = {
@@ -368,7 +366,7 @@ MODULE_DEVICE_TABLE(of, imx_pd_dt_ids);
 
 static struct platform_driver imx_pd_driver = {
 	.probe		= imx_pd_probe,
-	.remove		= imx_pd_remove,
+	.remove_new	= imx_pd_remove,
 	.driver		= {
 		.of_match_table = imx_pd_dt_ids,
 		.name	= "imx-parallel-display",

Original file line number	Diff line number	Diff line change
`@@ -255,19 +255,17 @@ static int dw_hdmi_imx_probe(struct platform_device *pdev)`
`255`	`255`	`return ret;`
`256`	`256`	`}`
`257`	`257`
`258`		`-static int dw_hdmi_imx_remove(struct platform_device *pdev)`
	`258`	`+static void dw_hdmi_imx_remove(struct platform_device *pdev)`
`259`	`259`	`{`
`260`	`260`	`struct imx_hdmi *hdmi = platform_get_drvdata(pdev);`
`261`	`261`
`262`	`262`	`component_del(&pdev->dev, &dw_hdmi_imx_ops);`
`263`	`263`	`dw_hdmi_remove(hdmi->hdmi);`
`264`		`-`
`265`		`- return 0;`
`266`	`264`	`}`
`267`	`265`
`268`	`266`	`static struct platform_driver dw_hdmi_imx_platform_driver = {`
`269`	`267`	`.probe = dw_hdmi_imx_probe,`
`270`		`- .remove = dw_hdmi_imx_remove,`
	`268`	`+ .remove_new = dw_hdmi_imx_remove,`
`271`	`269`	`.driver = {`
`272`	`270`	`.name = "dwhdmi-imx",`
`273`	`271`	`.of_match_table = dw_hdmi_imx_dt_ids,`
Original file line number	Diff line number	Diff line change
`@@ -292,10 +292,9 @@ static int imx_drm_platform_probe(struct platform_device *pdev)`
`292`	`292`	`return ret;`
`293`	`293`	`}`
`294`	`294`
`295`		`-static int imx_drm_platform_remove(struct platform_device *pdev)`
	`295`	`+static void imx_drm_platform_remove(struct platform_device *pdev)`
`296`	`296`	`{`
`297`	`297`	`component_master_del(&pdev->dev, &imx_drm_ops);`
`298`		`- return 0;`
`299`	`298`	`}`
`300`	`299`
`301`	`300`	`#ifdef CONFIG_PM_SLEEP`
`@@ -324,7 +323,7 @@ MODULE_DEVICE_TABLE(of, imx_drm_dt_ids);`
`324`	`323`
`325`	`324`	`static struct platform_driver imx_drm_pdrv = {`
`326`	`325`	`.probe = imx_drm_platform_probe,`
`327`		`- .remove = imx_drm_platform_remove,`
	`326`	`+ .remove_new = imx_drm_platform_remove,`
`328`	`327`	`.driver = {`
`329`	`328`	`.name = "imx-drm",`
`330`	`329`	`.pm = &imx_drm_pm_ops,`
Original file line number	Diff line number	Diff line change
`@@ -737,7 +737,7 @@ static int imx_ldb_probe(struct platform_device *pdev)`
`737`	`737`	`return ret;`
`738`	`738`	`}`
`739`	`739`
`740`		`-static int imx_ldb_remove(struct platform_device *pdev)`
	`740`	`+static void imx_ldb_remove(struct platform_device *pdev)`
`741`	`741`	`{`
`742`	`742`	`struct imx_ldb *imx_ldb = platform_get_drvdata(pdev);`
`743`	`743`	`int i;`
`@@ -750,12 +750,11 @@ static int imx_ldb_remove(struct platform_device *pdev)`
`750`	`750`	`}`
`751`	`751`
`752`	`752`	`component_del(&pdev->dev, &imx_ldb_ops);`
`753`		`- return 0;`
`754`	`753`	`}`
`755`	`754`
`756`	`755`	`static struct platform_driver imx_ldb_driver = {`
`757`	`756`	`.probe = imx_ldb_probe,`
`758`		`- .remove = imx_ldb_remove,`
	`757`	`+ .remove_new = imx_ldb_remove,`
`759`	`758`	`.driver = {`
`760`	`759`	`.of_match_table = imx_ldb_dt_ids,`
`761`	`760`	`.name = DRIVER_NAME,`
Original file line number	Diff line number	Diff line change
`@@ -645,10 +645,9 @@ static int imx_tve_probe(struct platform_device *pdev)`
`645`	`645`	`return component_add(dev, &imx_tve_ops);`
`646`	`646`	`}`
`647`	`647`
`648`		`-static int imx_tve_remove(struct platform_device *pdev)`
	`648`	`+static void imx_tve_remove(struct platform_device *pdev)`
`649`	`649`	`{`
`650`	`650`	`component_del(&pdev->dev, &imx_tve_ops);`
`651`		`- return 0;`
`652`	`651`	`}`
`653`	`652`
`654`	`653`	`static const struct of_device_id imx_tve_dt_ids[] = {`
`@@ -659,7 +658,7 @@ MODULE_DEVICE_TABLE(of, imx_tve_dt_ids);`
`659`	`658`
`660`	`659`	`static struct platform_driver imx_tve_driver = {`
`661`	`660`	`.probe = imx_tve_probe,`
`662`		`- .remove = imx_tve_remove,`
	`661`	`+ .remove_new = imx_tve_remove,`
`663`	`662`	`.driver = {`
`664`	`663`	`.of_match_table = imx_tve_dt_ids,`
`665`	`664`	`.name = "imx-tve",`
Original file line number	Diff line number	Diff line change
`@@ -441,16 +441,15 @@ static int ipu_drm_probe(struct platform_device *pdev)`
`441`	`441`	`return component_add(dev, &ipu_crtc_ops);`
`442`	`442`	`}`
`443`	`443`
`444`		`-static int ipu_drm_remove(struct platform_device *pdev)`
	`444`	`+static void ipu_drm_remove(struct platform_device *pdev)`
`445`	`445`	`{`
`446`	`446`	`component_del(&pdev->dev, &ipu_crtc_ops);`
`447`		`- return 0;`
`448`	`447`	`}`
`449`	`448`
`450`	`449`	`struct platform_driver ipu_drm_driver = {`
`451`	`450`	`.driver = {`
`452`	`451`	`.name = "imx-ipuv3-crtc",`
`453`	`452`	`},`
`454`	`453`	`.probe = ipu_drm_probe,`
`455`		`- .remove = ipu_drm_remove,`
	`454`	`+ .remove_new = ipu_drm_remove,`
`456`	`455`	`};`
Original file line number	Diff line number	Diff line change
`@@ -353,11 +353,9 @@ static int imx_pd_probe(struct platform_device *pdev)`
`353`	`353`	`return component_add(dev, &imx_pd_ops);`
`354`	`354`	`}`
`355`	`355`
`356`		`-static int imx_pd_remove(struct platform_device *pdev)`
	`356`	`+static void imx_pd_remove(struct platform_device *pdev)`
`357`	`357`	`{`
`358`	`358`	`component_del(&pdev->dev, &imx_pd_ops);`
`359`		`-`
`360`		`- return 0;`
`361`	`359`	`}`
`362`	`360`
`363`	`361`	`static const struct of_device_id imx_pd_dt_ids[] = {`
`@@ -368,7 +366,7 @@ MODULE_DEVICE_TABLE(of, imx_pd_dt_ids);`
`368`	`366`
`369`	`367`	`static struct platform_driver imx_pd_driver = {`
`370`	`368`	`.probe = imx_pd_probe,`
`371`		`- .remove = imx_pd_remove,`
	`369`	`+ .remove_new = imx_pd_remove,`
`372`	`370`	`.driver = {`
`373`	`371`	`.of_match_table = imx_pd_dt_ids,`
`374`	`372`	`.name = "imx-parallel-display",`