Commit 01790d5e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Javier Martinez Canillas

drm/msm: 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 msm 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>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230507162616.1368908-32-u.kleine-koenig@pengutronix.de
parent c04ca6bb
...@@ -647,10 +647,9 @@ static int adreno_probe(struct platform_device *pdev) ...@@ -647,10 +647,9 @@ static int adreno_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int adreno_remove(struct platform_device *pdev) static void adreno_remove(struct platform_device *pdev)
{ {
component_del(&pdev->dev, &a3xx_ops); component_del(&pdev->dev, &a3xx_ops);
return 0;
} }
static void adreno_shutdown(struct platform_device *pdev) static void adreno_shutdown(struct platform_device *pdev)
...@@ -765,7 +764,7 @@ static const struct dev_pm_ops adreno_pm_ops = { ...@@ -765,7 +764,7 @@ static const struct dev_pm_ops adreno_pm_ops = {
static struct platform_driver adreno_driver = { static struct platform_driver adreno_driver = {
.probe = adreno_probe, .probe = adreno_probe,
.remove = adreno_remove, .remove_new = adreno_remove,
.shutdown = adreno_shutdown, .shutdown = adreno_shutdown,
.driver = { .driver = {
.name = "adreno", .name = "adreno",
......
...@@ -1239,11 +1239,9 @@ static int dpu_dev_probe(struct platform_device *pdev) ...@@ -1239,11 +1239,9 @@ static int dpu_dev_probe(struct platform_device *pdev)
return msm_drv_probe(&pdev->dev, dpu_kms_init); return msm_drv_probe(&pdev->dev, dpu_kms_init);
} }
static int dpu_dev_remove(struct platform_device *pdev) static void dpu_dev_remove(struct platform_device *pdev)
{ {
component_master_del(&pdev->dev, &msm_drm_ops); component_master_del(&pdev->dev, &msm_drm_ops);
return 0;
} }
static int __maybe_unused dpu_runtime_suspend(struct device *dev) static int __maybe_unused dpu_runtime_suspend(struct device *dev)
...@@ -1318,7 +1316,7 @@ MODULE_DEVICE_TABLE(of, dpu_dt_match); ...@@ -1318,7 +1316,7 @@ MODULE_DEVICE_TABLE(of, dpu_dt_match);
static struct platform_driver dpu_driver = { static struct platform_driver dpu_driver = {
.probe = dpu_dev_probe, .probe = dpu_dev_probe,
.remove = dpu_dev_remove, .remove_new = dpu_dev_remove,
.shutdown = msm_drv_shutdown, .shutdown = msm_drv_shutdown,
.driver = { .driver = {
.name = "msm_dpu", .name = "msm_dpu",
......
...@@ -561,11 +561,9 @@ static int mdp4_probe(struct platform_device *pdev) ...@@ -561,11 +561,9 @@ static int mdp4_probe(struct platform_device *pdev)
return msm_drv_probe(&pdev->dev, mdp4_kms_init); return msm_drv_probe(&pdev->dev, mdp4_kms_init);
} }
static int mdp4_remove(struct platform_device *pdev) static void mdp4_remove(struct platform_device *pdev)
{ {
component_master_del(&pdev->dev, &msm_drm_ops); component_master_del(&pdev->dev, &msm_drm_ops);
return 0;
} }
static const struct of_device_id mdp4_dt_match[] = { static const struct of_device_id mdp4_dt_match[] = {
...@@ -576,7 +574,7 @@ MODULE_DEVICE_TABLE(of, mdp4_dt_match); ...@@ -576,7 +574,7 @@ MODULE_DEVICE_TABLE(of, mdp4_dt_match);
static struct platform_driver mdp4_platform_driver = { static struct platform_driver mdp4_platform_driver = {
.probe = mdp4_probe, .probe = mdp4_probe,
.remove = mdp4_remove, .remove_new = mdp4_remove,
.shutdown = msm_drv_shutdown, .shutdown = msm_drv_shutdown,
.driver = { .driver = {
.name = "mdp4", .name = "mdp4",
......
...@@ -942,11 +942,10 @@ static int mdp5_dev_probe(struct platform_device *pdev) ...@@ -942,11 +942,10 @@ static int mdp5_dev_probe(struct platform_device *pdev)
return msm_drv_probe(&pdev->dev, mdp5_kms_init); return msm_drv_probe(&pdev->dev, mdp5_kms_init);
} }
static int mdp5_dev_remove(struct platform_device *pdev) static void mdp5_dev_remove(struct platform_device *pdev)
{ {
DBG(""); DBG("");
component_master_del(&pdev->dev, &msm_drm_ops); component_master_del(&pdev->dev, &msm_drm_ops);
return 0;
} }
static __maybe_unused int mdp5_runtime_suspend(struct device *dev) static __maybe_unused int mdp5_runtime_suspend(struct device *dev)
...@@ -987,7 +986,7 @@ MODULE_DEVICE_TABLE(of, mdp5_dt_match); ...@@ -987,7 +986,7 @@ MODULE_DEVICE_TABLE(of, mdp5_dt_match);
static struct platform_driver mdp5_driver = { static struct platform_driver mdp5_driver = {
.probe = mdp5_dev_probe, .probe = mdp5_dev_probe,
.remove = mdp5_dev_remove, .remove_new = mdp5_dev_remove,
.shutdown = msm_drv_shutdown, .shutdown = msm_drv_shutdown,
.driver = { .driver = {
.name = "msm_mdp", .name = "msm_mdp",
......
...@@ -1296,7 +1296,7 @@ static int dp_display_probe(struct platform_device *pdev) ...@@ -1296,7 +1296,7 @@ static int dp_display_probe(struct platform_device *pdev)
return rc; return rc;
} }
static int dp_display_remove(struct platform_device *pdev) static void dp_display_remove(struct platform_device *pdev)
{ {
struct dp_display_private *dp = dev_get_dp_display_private(&pdev->dev); struct dp_display_private *dp = dev_get_dp_display_private(&pdev->dev);
...@@ -1304,8 +1304,6 @@ static int dp_display_remove(struct platform_device *pdev) ...@@ -1304,8 +1304,6 @@ static int dp_display_remove(struct platform_device *pdev)
dp_display_deinit_sub_modules(dp); dp_display_deinit_sub_modules(dp);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
return 0;
} }
static int dp_pm_resume(struct device *dev) static int dp_pm_resume(struct device *dev)
...@@ -1415,7 +1413,7 @@ static const struct dev_pm_ops dp_pm_ops = { ...@@ -1415,7 +1413,7 @@ static const struct dev_pm_ops dp_pm_ops = {
static struct platform_driver dp_display_driver = { static struct platform_driver dp_display_driver = {
.probe = dp_display_probe, .probe = dp_display_probe,
.remove = dp_display_remove, .remove_new = dp_display_remove,
.driver = { .driver = {
.name = "msm-dp-display", .name = "msm-dp-display",
.of_match_table = dp_dt_match, .of_match_table = dp_dt_match,
......
...@@ -161,14 +161,12 @@ static int dsi_dev_probe(struct platform_device *pdev) ...@@ -161,14 +161,12 @@ static int dsi_dev_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int dsi_dev_remove(struct platform_device *pdev) static void dsi_dev_remove(struct platform_device *pdev)
{ {
struct msm_dsi *msm_dsi = platform_get_drvdata(pdev); struct msm_dsi *msm_dsi = platform_get_drvdata(pdev);
DBG(""); DBG("");
dsi_destroy(msm_dsi); dsi_destroy(msm_dsi);
return 0;
} }
static const struct of_device_id dt_match[] = { static const struct of_device_id dt_match[] = {
...@@ -187,7 +185,7 @@ static const struct dev_pm_ops dsi_pm_ops = { ...@@ -187,7 +185,7 @@ static const struct dev_pm_ops dsi_pm_ops = {
static struct platform_driver dsi_driver = { static struct platform_driver dsi_driver = {
.probe = dsi_dev_probe, .probe = dsi_dev_probe,
.remove = dsi_dev_remove, .remove_new = dsi_dev_remove,
.driver = { .driver = {
.name = "msm_dsi", .name = "msm_dsi",
.of_match_table = dt_match, .of_match_table = dt_match,
......
...@@ -551,15 +551,13 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev) ...@@ -551,15 +551,13 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int msm_hdmi_dev_remove(struct platform_device *pdev) static void msm_hdmi_dev_remove(struct platform_device *pdev)
{ {
struct hdmi *hdmi = dev_get_drvdata(&pdev->dev); struct hdmi *hdmi = dev_get_drvdata(&pdev->dev);
component_del(&pdev->dev, &msm_hdmi_ops); component_del(&pdev->dev, &msm_hdmi_ops);
msm_hdmi_put_phy(hdmi); msm_hdmi_put_phy(hdmi);
return 0;
} }
static const struct of_device_id msm_hdmi_dt_match[] = { static const struct of_device_id msm_hdmi_dt_match[] = {
...@@ -574,7 +572,7 @@ static const struct of_device_id msm_hdmi_dt_match[] = { ...@@ -574,7 +572,7 @@ static const struct of_device_id msm_hdmi_dt_match[] = {
static struct platform_driver msm_hdmi_driver = { static struct platform_driver msm_hdmi_driver = {
.probe = msm_hdmi_dev_probe, .probe = msm_hdmi_dev_probe,
.remove = msm_hdmi_dev_remove, .remove_new = msm_hdmi_dev_remove,
.driver = { .driver = {
.name = "hdmi_msm", .name = "hdmi_msm",
.of_match_table = msm_hdmi_dt_match, .of_match_table = msm_hdmi_dt_match,
......
...@@ -177,11 +177,9 @@ static int msm_hdmi_phy_probe(struct platform_device *pdev) ...@@ -177,11 +177,9 @@ static int msm_hdmi_phy_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int msm_hdmi_phy_remove(struct platform_device *pdev) static void msm_hdmi_phy_remove(struct platform_device *pdev)
{ {
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
return 0;
} }
static const struct of_device_id msm_hdmi_phy_dt_match[] = { static const struct of_device_id msm_hdmi_phy_dt_match[] = {
...@@ -200,7 +198,7 @@ static const struct of_device_id msm_hdmi_phy_dt_match[] = { ...@@ -200,7 +198,7 @@ static const struct of_device_id msm_hdmi_phy_dt_match[] = {
static struct platform_driver msm_hdmi_phy_platform_driver = { static struct platform_driver msm_hdmi_phy_platform_driver = {
.probe = msm_hdmi_phy_probe, .probe = msm_hdmi_phy_probe,
.remove = msm_hdmi_phy_remove, .remove_new = msm_hdmi_phy_remove,
.driver = { .driver = {
.name = "msm_hdmi_phy", .name = "msm_hdmi_phy",
.of_match_table = msm_hdmi_phy_dt_match, .of_match_table = msm_hdmi_phy_dt_match,
......
...@@ -1278,11 +1278,9 @@ static int msm_pdev_probe(struct platform_device *pdev) ...@@ -1278,11 +1278,9 @@ static int msm_pdev_probe(struct platform_device *pdev)
return msm_drv_probe(&pdev->dev, NULL); return msm_drv_probe(&pdev->dev, NULL);
} }
static int msm_pdev_remove(struct platform_device *pdev) static void msm_pdev_remove(struct platform_device *pdev)
{ {
component_master_del(&pdev->dev, &msm_drm_ops); component_master_del(&pdev->dev, &msm_drm_ops);
return 0;
} }
void msm_drv_shutdown(struct platform_device *pdev) void msm_drv_shutdown(struct platform_device *pdev)
...@@ -1303,7 +1301,7 @@ void msm_drv_shutdown(struct platform_device *pdev) ...@@ -1303,7 +1301,7 @@ void msm_drv_shutdown(struct platform_device *pdev)
static struct platform_driver msm_platform_driver = { static struct platform_driver msm_platform_driver = {
.probe = msm_pdev_probe, .probe = msm_pdev_probe,
.remove = msm_pdev_remove, .remove_new = msm_pdev_remove,
.shutdown = msm_drv_shutdown, .shutdown = msm_drv_shutdown,
.driver = { .driver = {
.name = "msm", .name = "msm",
......
...@@ -492,15 +492,13 @@ static int mdss_probe(struct platform_device *pdev) ...@@ -492,15 +492,13 @@ static int mdss_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int mdss_remove(struct platform_device *pdev) static void mdss_remove(struct platform_device *pdev)
{ {
struct msm_mdss *mdss = platform_get_drvdata(pdev); struct msm_mdss *mdss = platform_get_drvdata(pdev);
of_platform_depopulate(&pdev->dev); of_platform_depopulate(&pdev->dev);
msm_mdss_destroy(mdss); msm_mdss_destroy(mdss);
return 0;
} }
static const struct msm_mdss_data sc7180_data = { static const struct msm_mdss_data sc7180_data = {
...@@ -594,7 +592,7 @@ MODULE_DEVICE_TABLE(of, mdss_dt_match); ...@@ -594,7 +592,7 @@ MODULE_DEVICE_TABLE(of, mdss_dt_match);
static struct platform_driver mdss_platform_driver = { static struct platform_driver mdss_platform_driver = {
.probe = mdss_probe, .probe = mdss_probe,
.remove = mdss_remove, .remove_new = mdss_remove,
.driver = { .driver = {
.name = "msm-mdss", .name = "msm-mdss",
.of_match_table = mdss_dt_match, .of_match_table = mdss_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