drm/tegra: rgb: Make tegra_dc_rgb_remove() return void

This function returned zero unconditionally. Make it return no value and
simplify all callers accordingly.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index bd108159fc2c75ed7961830d5b086d7c40c73ed2..6bf1b2bc43b12c2d425ae27314980d79af9954fb 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -3266,15 +3266,10 @@ disable_pm:
 static int tegra_dc_remove(struct platform_device *pdev)
 {
        struct tegra_dc *dc = platform_get_drvdata(pdev);
-       int err;
 
        host1x_client_unregister(&dc->client);
 
-       err = tegra_dc_rgb_remove(dc);
-       if (err < 0) {
-               dev_err(&pdev->dev, "failed to remove RGB output: %d\n", err);
-               return err;
-       }
+       tegra_dc_rgb_remove(dc);
 
        pm_runtime_disable(&pdev->dev);
 

diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h
index f902794d42ccbdc9195502b982f88cfef860dc86..0559fa6b1bf70416e51d5067cc04a6ae6572de23 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.h
+++ b/drivers/gpu/drm/tegra/dc.h
@@ -169,7 +169,7 @@ void tegra_crtc_atomic_post_commit(struct drm_crtc *crtc,
 
 /* from rgb.c */
 int tegra_dc_rgb_probe(struct tegra_dc *dc);
-int tegra_dc_rgb_remove(struct tegra_dc *dc);
+void tegra_dc_rgb_remove(struct tegra_dc *dc);
 int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc);
 int tegra_dc_rgb_exit(struct tegra_dc *dc);
 

diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
index ff8fce36d2aa14e09a27c3fd662a8a407410c788..da2d9baca21487f7086025bdb321dbcd9d1edf81 100644 (file)
--- a/drivers/gpu/drm/tegra/rgb.c
+++ b/drivers/gpu/drm/tegra/rgb.c
@@ -250,12 +250,12 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc)
        return 0;
 }
 
-int tegra_dc_rgb_remove(struct tegra_dc *dc)
+void tegra_dc_rgb_remove(struct tegra_dc *dc)
 {
        struct tegra_rgb *rgb;
 
        if (!dc->rgb)
-               return 0;
+               return;
 
        rgb = to_rgb(dc->rgb);
        clk_put(rgb->pll_d2_out0);
@@ -263,8 +263,6 @@ int tegra_dc_rgb_remove(struct tegra_dc *dc)
 
        tegra_output_remove(dc->rgb);
        dc->rgb = NULL;
-
-       return 0;
 }
 
 int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc)