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

drm/rockchip: 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 rockchip drm 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>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230507162616.1368908-39-u.kleine-koenig@pengutronix.de
parent e41977a8

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+2 −4
Original line number Diff line number Diff line
@@ -419,14 +419,12 @@ static int rockchip_dp_probe(struct platform_device *pdev) 
	return ret;

}



static int rockchip_dp_remove(struct platform_device *pdev)

static void rockchip_dp_remove(struct platform_device *pdev)

{

	struct rockchip_dp_device *dp = platform_get_drvdata(pdev);



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

	analogix_dp_remove(dp->adp);



	return 0;

}



#ifdef CONFIG_PM_SLEEP
@@ -481,7 +479,7 @@ MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids); 


struct platform_driver rockchip_dp_driver = {

	.probe = rockchip_dp_probe,

	.remove = rockchip_dp_remove,

	.remove_new = rockchip_dp_remove,

	.driver = {

		   .name = "rockchip-dp",

		   .pm = &rockchip_dp_pm_ops,

drivers/gpu/drm/rockchip/cdn-dp-core.c

+2 −4
Original line number Diff line number Diff line
@@ -1222,15 +1222,13 @@ static int cdn_dp_probe(struct platform_device *pdev) 
	return component_add(dev, &cdn_dp_component_ops);

}



static int cdn_dp_remove(struct platform_device *pdev)

static void cdn_dp_remove(struct platform_device *pdev)

{

	struct cdn_dp_device *dp = platform_get_drvdata(pdev);



	platform_device_unregister(dp->audio_pdev);

	cdn_dp_suspend(dp->dev);

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



	return 0;

}



static void cdn_dp_shutdown(struct platform_device *pdev)
@@ -1247,7 +1245,7 @@ static const struct dev_pm_ops cdn_dp_pm_ops = { 


struct platform_driver cdn_dp_driver = {

	.probe = cdn_dp_probe,

	.remove = cdn_dp_remove,

	.remove_new = cdn_dp_remove,

	.shutdown = cdn_dp_shutdown,

	.driver = {

		   .name = "cdn-dp",

drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c

+2 −4
Original line number Diff line number Diff line
@@ -1463,13 +1463,11 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) 
	return 0;

}



static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)

static void dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)

{

	struct dw_mipi_dsi_rockchip *dsi = platform_get_drvdata(pdev);



	dw_mipi_dsi_remove(dsi->dmd);



	return 0;

}



static const struct rockchip_dw_dsi_chip_data px30_chip_data[] = {
@@ -1671,7 +1669,7 @@ MODULE_DEVICE_TABLE(of, dw_mipi_dsi_rockchip_dt_ids); 


struct platform_driver dw_mipi_dsi_rockchip_driver = {

	.probe		= dw_mipi_dsi_rockchip_probe,

	.remove		= dw_mipi_dsi_rockchip_remove,

	.remove_new	= dw_mipi_dsi_rockchip_remove,

	.driver		= {

		.of_match_table = dw_mipi_dsi_rockchip_dt_ids,

		.pm	= &dw_mipi_dsi_rockchip_pm_ops,

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

+2 −4
Original line number Diff line number Diff line
@@ -684,11 +684,9 @@ static int dw_hdmi_rockchip_probe(struct platform_device *pdev) 
	return component_add(&pdev->dev, &dw_hdmi_rockchip_ops);

}



static int dw_hdmi_rockchip_remove(struct platform_device *pdev)

static void dw_hdmi_rockchip_remove(struct platform_device *pdev)

{

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



	return 0;

}



static int __maybe_unused dw_hdmi_rockchip_resume(struct device *dev)
@@ -706,7 +704,7 @@ static const struct dev_pm_ops dw_hdmi_rockchip_pm = { 


struct platform_driver dw_hdmi_rockchip_pltfm_driver = {

	.probe  = dw_hdmi_rockchip_probe,

	.remove = dw_hdmi_rockchip_remove,

	.remove_new = dw_hdmi_rockchip_remove,

	.driver = {

		.name = "dwhdmi-rockchip",

		.pm = &dw_hdmi_rockchip_pm,

drivers/gpu/drm/rockchip/inno_hdmi.c

+2 −4
Original line number Diff line number Diff line
@@ -919,11 +919,9 @@ static int inno_hdmi_probe(struct platform_device *pdev) 
	return component_add(&pdev->dev, &inno_hdmi_ops);

}



static int inno_hdmi_remove(struct platform_device *pdev)

static void inno_hdmi_remove(struct platform_device *pdev)

{

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



	return 0;

}



static const struct of_device_id inno_hdmi_dt_ids[] = {
@@ -935,7 +933,7 @@ MODULE_DEVICE_TABLE(of, inno_hdmi_dt_ids); 


struct platform_driver inno_hdmi_driver = {

	.probe  = inno_hdmi_probe,

	.remove = inno_hdmi_remove,

	.remove_new = inno_hdmi_remove,

	.driver = {

		.name = "innohdmi-rockchip",

		.of_match_table = inno_hdmi_dt_ids,