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

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
...@@ -419,14 +419,12 @@ static int rockchip_dp_probe(struct platform_device *pdev) ...@@ -419,14 +419,12 @@ static int rockchip_dp_probe(struct platform_device *pdev)
return ret; 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); struct rockchip_dp_device *dp = platform_get_drvdata(pdev);
component_del(&pdev->dev, &rockchip_dp_component_ops); component_del(&pdev->dev, &rockchip_dp_component_ops);
analogix_dp_remove(dp->adp); analogix_dp_remove(dp->adp);
return 0;
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
...@@ -481,7 +479,7 @@ MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids); ...@@ -481,7 +479,7 @@ MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids);
struct platform_driver rockchip_dp_driver = { struct platform_driver rockchip_dp_driver = {
.probe = rockchip_dp_probe, .probe = rockchip_dp_probe,
.remove = rockchip_dp_remove, .remove_new = rockchip_dp_remove,
.driver = { .driver = {
.name = "rockchip-dp", .name = "rockchip-dp",
.pm = &rockchip_dp_pm_ops, .pm = &rockchip_dp_pm_ops,
......
...@@ -1222,15 +1222,13 @@ static int cdn_dp_probe(struct platform_device *pdev) ...@@ -1222,15 +1222,13 @@ static int cdn_dp_probe(struct platform_device *pdev)
return component_add(dev, &cdn_dp_component_ops); 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); struct cdn_dp_device *dp = platform_get_drvdata(pdev);
platform_device_unregister(dp->audio_pdev); platform_device_unregister(dp->audio_pdev);
cdn_dp_suspend(dp->dev); cdn_dp_suspend(dp->dev);
component_del(&pdev->dev, &cdn_dp_component_ops); component_del(&pdev->dev, &cdn_dp_component_ops);
return 0;
} }
static void cdn_dp_shutdown(struct platform_device *pdev) static void cdn_dp_shutdown(struct platform_device *pdev)
...@@ -1247,7 +1245,7 @@ static const struct dev_pm_ops cdn_dp_pm_ops = { ...@@ -1247,7 +1245,7 @@ static const struct dev_pm_ops cdn_dp_pm_ops = {
struct platform_driver cdn_dp_driver = { struct platform_driver cdn_dp_driver = {
.probe = cdn_dp_probe, .probe = cdn_dp_probe,
.remove = cdn_dp_remove, .remove_new = cdn_dp_remove,
.shutdown = cdn_dp_shutdown, .shutdown = cdn_dp_shutdown,
.driver = { .driver = {
.name = "cdn-dp", .name = "cdn-dp",
......
...@@ -1463,13 +1463,11 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) ...@@ -1463,13 +1463,11 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
return 0; 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); struct dw_mipi_dsi_rockchip *dsi = platform_get_drvdata(pdev);
dw_mipi_dsi_remove(dsi->dmd); dw_mipi_dsi_remove(dsi->dmd);
return 0;
} }
static const struct rockchip_dw_dsi_chip_data px30_chip_data[] = { 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); ...@@ -1671,7 +1669,7 @@ MODULE_DEVICE_TABLE(of, dw_mipi_dsi_rockchip_dt_ids);
struct platform_driver dw_mipi_dsi_rockchip_driver = { struct platform_driver dw_mipi_dsi_rockchip_driver = {
.probe = dw_mipi_dsi_rockchip_probe, .probe = dw_mipi_dsi_rockchip_probe,
.remove = dw_mipi_dsi_rockchip_remove, .remove_new = dw_mipi_dsi_rockchip_remove,
.driver = { .driver = {
.of_match_table = dw_mipi_dsi_rockchip_dt_ids, .of_match_table = dw_mipi_dsi_rockchip_dt_ids,
.pm = &dw_mipi_dsi_rockchip_pm_ops, .pm = &dw_mipi_dsi_rockchip_pm_ops,
......
...@@ -684,11 +684,9 @@ static int dw_hdmi_rockchip_probe(struct platform_device *pdev) ...@@ -684,11 +684,9 @@ static int dw_hdmi_rockchip_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &dw_hdmi_rockchip_ops); 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); component_del(&pdev->dev, &dw_hdmi_rockchip_ops);
return 0;
} }
static int __maybe_unused dw_hdmi_rockchip_resume(struct device *dev) 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 = { ...@@ -706,7 +704,7 @@ static const struct dev_pm_ops dw_hdmi_rockchip_pm = {
struct platform_driver dw_hdmi_rockchip_pltfm_driver = { struct platform_driver dw_hdmi_rockchip_pltfm_driver = {
.probe = dw_hdmi_rockchip_probe, .probe = dw_hdmi_rockchip_probe,
.remove = dw_hdmi_rockchip_remove, .remove_new = dw_hdmi_rockchip_remove,
.driver = { .driver = {
.name = "dwhdmi-rockchip", .name = "dwhdmi-rockchip",
.pm = &dw_hdmi_rockchip_pm, .pm = &dw_hdmi_rockchip_pm,
......
...@@ -919,11 +919,9 @@ static int inno_hdmi_probe(struct platform_device *pdev) ...@@ -919,11 +919,9 @@ static int inno_hdmi_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &inno_hdmi_ops); 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); component_del(&pdev->dev, &inno_hdmi_ops);
return 0;
} }
static const struct of_device_id inno_hdmi_dt_ids[] = { static const struct of_device_id inno_hdmi_dt_ids[] = {
...@@ -935,7 +933,7 @@ MODULE_DEVICE_TABLE(of, inno_hdmi_dt_ids); ...@@ -935,7 +933,7 @@ MODULE_DEVICE_TABLE(of, inno_hdmi_dt_ids);
struct platform_driver inno_hdmi_driver = { struct platform_driver inno_hdmi_driver = {
.probe = inno_hdmi_probe, .probe = inno_hdmi_probe,
.remove = inno_hdmi_remove, .remove_new = inno_hdmi_remove,
.driver = { .driver = {
.name = "innohdmi-rockchip", .name = "innohdmi-rockchip",
.of_match_table = inno_hdmi_dt_ids, .of_match_table = inno_hdmi_dt_ids,
......
...@@ -858,11 +858,9 @@ static int rk3066_hdmi_probe(struct platform_device *pdev) ...@@ -858,11 +858,9 @@ static int rk3066_hdmi_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &rk3066_hdmi_ops); return component_add(&pdev->dev, &rk3066_hdmi_ops);
} }
static int rk3066_hdmi_remove(struct platform_device *pdev) static void rk3066_hdmi_remove(struct platform_device *pdev)
{ {
component_del(&pdev->dev, &rk3066_hdmi_ops); component_del(&pdev->dev, &rk3066_hdmi_ops);
return 0;
} }
static const struct of_device_id rk3066_hdmi_dt_ids[] = { static const struct of_device_id rk3066_hdmi_dt_ids[] = {
...@@ -873,7 +871,7 @@ MODULE_DEVICE_TABLE(of, rk3066_hdmi_dt_ids); ...@@ -873,7 +871,7 @@ MODULE_DEVICE_TABLE(of, rk3066_hdmi_dt_ids);
struct platform_driver rk3066_hdmi_driver = { struct platform_driver rk3066_hdmi_driver = {
.probe = rk3066_hdmi_probe, .probe = rk3066_hdmi_probe,
.remove = rk3066_hdmi_remove, .remove_new = rk3066_hdmi_remove,
.driver = { .driver = {
.name = "rockchip-rk3066-hdmi", .name = "rockchip-rk3066-hdmi",
.of_match_table = rk3066_hdmi_dt_ids, .of_match_table = rk3066_hdmi_dt_ids,
......
...@@ -450,13 +450,11 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) ...@@ -450,13 +450,11 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int rockchip_drm_platform_remove(struct platform_device *pdev) static void rockchip_drm_platform_remove(struct platform_device *pdev)
{ {
component_master_del(&pdev->dev, &rockchip_drm_ops); component_master_del(&pdev->dev, &rockchip_drm_ops);
rockchip_drm_match_remove(&pdev->dev); rockchip_drm_match_remove(&pdev->dev);
return 0;
} }
static void rockchip_drm_platform_shutdown(struct platform_device *pdev) static void rockchip_drm_platform_shutdown(struct platform_device *pdev)
...@@ -475,7 +473,7 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids); ...@@ -475,7 +473,7 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids);
static struct platform_driver rockchip_drm_platform_driver = { static struct platform_driver rockchip_drm_platform_driver = {
.probe = rockchip_drm_platform_probe, .probe = rockchip_drm_platform_probe,
.remove = rockchip_drm_platform_remove, .remove_new = rockchip_drm_platform_remove,
.shutdown = rockchip_drm_platform_shutdown, .shutdown = rockchip_drm_platform_shutdown,
.driver = { .driver = {
.name = "rockchip-drm", .name = "rockchip-drm",
......
...@@ -739,19 +739,17 @@ static int rockchip_lvds_probe(struct platform_device *pdev) ...@@ -739,19 +739,17 @@ static int rockchip_lvds_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int rockchip_lvds_remove(struct platform_device *pdev) static void rockchip_lvds_remove(struct platform_device *pdev)
{ {
struct rockchip_lvds *lvds = platform_get_drvdata(pdev); struct rockchip_lvds *lvds = platform_get_drvdata(pdev);
component_del(&pdev->dev, &rockchip_lvds_component_ops); component_del(&pdev->dev, &rockchip_lvds_component_ops);
clk_unprepare(lvds->pclk); clk_unprepare(lvds->pclk);
return 0;
} }
struct platform_driver rockchip_lvds_driver = { struct platform_driver rockchip_lvds_driver = {
.probe = rockchip_lvds_probe, .probe = rockchip_lvds_probe,
.remove = rockchip_lvds_remove, .remove_new = rockchip_lvds_remove,
.driver = { .driver = {
.name = "rockchip-lvds", .name = "rockchip-lvds",
.of_match_table = of_match_ptr(rockchip_lvds_dt_ids), .of_match_table = of_match_ptr(rockchip_lvds_dt_ids),
......
...@@ -264,16 +264,14 @@ static int vop2_probe(struct platform_device *pdev) ...@@ -264,16 +264,14 @@ static int vop2_probe(struct platform_device *pdev)
return component_add(dev, &vop2_component_ops); return component_add(dev, &vop2_component_ops);
} }
static int vop2_remove(struct platform_device *pdev) static void vop2_remove(struct platform_device *pdev)
{ {
component_del(&pdev->dev, &vop2_component_ops); component_del(&pdev->dev, &vop2_component_ops);
return 0;
} }
struct platform_driver vop2_platform_driver = { struct platform_driver vop2_platform_driver = {
.probe = vop2_probe, .probe = vop2_probe,
.remove = vop2_remove, .remove_new = vop2_remove,
.driver = { .driver = {
.name = "rockchip-vop2", .name = "rockchip-vop2",
.of_match_table = of_match_ptr(vop2_dt_match), .of_match_table = of_match_ptr(vop2_dt_match),
......
...@@ -1163,16 +1163,14 @@ static int vop_probe(struct platform_device *pdev) ...@@ -1163,16 +1163,14 @@ static int vop_probe(struct platform_device *pdev)
return component_add(dev, &vop_component_ops); return component_add(dev, &vop_component_ops);
} }
static int vop_remove(struct platform_device *pdev) static void vop_remove(struct platform_device *pdev)
{ {
component_del(&pdev->dev, &vop_component_ops); component_del(&pdev->dev, &vop_component_ops);
return 0;
} }
struct platform_driver vop_platform_driver = { struct platform_driver vop_platform_driver = {
.probe = vop_probe, .probe = vop_probe,
.remove = vop_remove, .remove_new = vop_remove,
.driver = { .driver = {
.name = "rockchip-vop", .name = "rockchip-vop",
.of_match_table = vop_driver_dt_match, .of_match_table = vop_driver_dt_match,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment