Commit 43740540 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Thierry Reding
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 55879dad

drivers/gpu/drm/tegra/dc.c

+1 −6
Original line number Diff line number Diff line
@@ -3266,15 +3266,10 @@ static int tegra_dc_probe(struct platform_device *pdev) 
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);

drivers/gpu/drm/tegra/dc.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/tegra/rgb.c

+2 −4
Original line number Diff line number Diff line
@@ -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)