Unverified Commit 3095f112 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Javier Martinez Canillas
Browse files

drm/imx/ipuv3: 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 the ipuv3 imx drivers from always returning zero in
the remove callback to the void returning variant.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230507162616.1368908-23-u.kleine-koenig@pengutronix.de
parent 5aa1dfcd

drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c

+2 −4
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/imx/ipuv3/imx-drm-core.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/imx/ipuv3/imx-ldb.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/imx/ipuv3/imx-tve.c

+2 −3
Original line number Diff line number Diff line
@@ -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",

drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c

+2 −3
Original line number Diff line number Diff line
@@ -441,10 +441,9 @@ 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 = {
@@ -452,5 +451,5 @@ struct platform_driver ipu_drm_driver = { 
		.name = "imx-ipuv3-crtc",

	},

	.probe = ipu_drm_probe,

	.remove = ipu_drm_remove,

	.remove_new = ipu_drm_remove,

};