Commit c2807ecb authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Douglas Anderson
Browse files

drm/omap: 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 omap drm driver 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 avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230507162616.1368908-35-u.kleine-koenig@pengutronix.de
parent e52d1282

drivers/gpu/drm/omapdrm/dss/dispc.c

+2 −3
Original line number Diff line number Diff line
@@ -4858,10 +4858,9 @@ static int dispc_probe(struct platform_device *pdev) 
	return component_add(&pdev->dev, &dispc_component_ops);

}



static int dispc_remove(struct platform_device *pdev)

static void dispc_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &dispc_component_ops);

	return 0;

}



static __maybe_unused int dispc_runtime_suspend(struct device *dev)
@@ -4913,7 +4912,7 @@ static const struct dev_pm_ops dispc_pm_ops = { 


struct platform_driver omap_dispchw_driver = {

	.probe		= dispc_probe,

	.remove         = dispc_remove,

	.remove_new     = dispc_remove,

	.driver         = {

		.name   = "omapdss_dispc",

		.pm	= &dispc_pm_ops,

drivers/gpu/drm/omapdrm/dss/dsi.c

+2 −4
Original line number Diff line number Diff line
@@ -5044,7 +5044,7 @@ static int dsi_probe(struct platform_device *pdev) 
	return r;

}



static int dsi_remove(struct platform_device *pdev)

static void dsi_remove(struct platform_device *pdev)

{

	struct dsi_data *dsi = platform_get_drvdata(pdev);
@@ -5060,8 +5060,6 @@ static int dsi_remove(struct platform_device *pdev) 
		regulator_disable(dsi->vdds_dsi_reg);

		dsi->vdds_dsi_enabled = false;

	}



	return 0;

}



static __maybe_unused int dsi_runtime_suspend(struct device *dev)
@@ -5095,7 +5093,7 @@ static const struct dev_pm_ops dsi_pm_ops = { 


struct platform_driver omap_dsihw_driver = {

	.probe		= dsi_probe,

	.remove		= dsi_remove,

	.remove_new	= dsi_remove,

	.driver         = {

		.name   = "omapdss_dsi",

		.pm	= &dsi_pm_ops,

drivers/gpu/drm/omapdrm/dss/dss.c

+2 −4
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ static int dss_probe(struct platform_device *pdev) 
	return r;

}



static int dss_remove(struct platform_device *pdev)

static void dss_remove(struct platform_device *pdev)

{

	struct dss_device *dss = platform_get_drvdata(pdev);
@@ -1557,8 +1557,6 @@ static int dss_remove(struct platform_device *pdev) 
	dss_put_clocks(dss);



	kfree(dss);



	return 0;

}



static void dss_shutdown(struct platform_device *pdev)
@@ -1607,7 +1605,7 @@ static const struct dev_pm_ops dss_pm_ops = { 


struct platform_driver omap_dsshw_driver = {

	.probe		= dss_probe,

	.remove		= dss_remove,

	.remove_new	= dss_remove,

	.shutdown	= dss_shutdown,

	.driver         = {

		.name   = "omapdss_dss",

drivers/gpu/drm/omapdrm/dss/hdmi4.c

+2 −3
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static int hdmi4_probe(struct platform_device *pdev) 
	return r;

}



static int hdmi4_remove(struct platform_device *pdev)

static void hdmi4_remove(struct platform_device *pdev)

{

	struct omap_hdmi *hdmi = platform_get_drvdata(pdev);
@@ -835,7 +835,6 @@ static int hdmi4_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);



	kfree(hdmi);

	return 0;

}



static const struct of_device_id hdmi_of_match[] = {
@@ -845,7 +844,7 @@ static const struct of_device_id hdmi_of_match[] = { 


struct platform_driver omapdss_hdmi4hw_driver = {

	.probe		= hdmi4_probe,

	.remove		= hdmi4_remove,

	.remove_new	= hdmi4_remove,

	.driver         = {

		.name   = "omapdss_hdmi",

		.of_match_table = hdmi_of_match,

drivers/gpu/drm/omapdrm/dss/hdmi5.c

+2 −3
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static int hdmi5_probe(struct platform_device *pdev) 
	return r;

}



static int hdmi5_remove(struct platform_device *pdev)

static void hdmi5_remove(struct platform_device *pdev)

{

	struct omap_hdmi *hdmi = platform_get_drvdata(pdev);
@@ -809,7 +809,6 @@ static int hdmi5_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);



	kfree(hdmi);

	return 0;

}



static const struct of_device_id hdmi_of_match[] = {
@@ -820,7 +819,7 @@ static const struct of_device_id hdmi_of_match[] = { 


struct platform_driver omapdss_hdmi5hw_driver = {

	.probe		= hdmi5_probe,

	.remove		= hdmi5_remove,

	.remove_new	= hdmi5_remove,

	.driver         = {

		.name   = "omapdss_hdmi5",

		.of_match_table = hdmi_of_match,