From 328ec69e7f9e7192c3f7653a5ec46d6e9a5fe60d Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Fri, 19 Dec 2014 15:55:08 +0100 Subject: drm/tegra: Output cleanup functions cannot fail The tegra_output_exit() and tegra_output_remove() functions cannot fail, so make them return void. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/rgb.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/drm/tegra/rgb.c') diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c index ab6093889be8..0c932f9dc12d 100644 --- a/drivers/gpu/drm/tegra/rgb.c +++ b/drivers/gpu/drm/tegra/rgb.c @@ -287,15 +287,10 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc) int tegra_dc_rgb_remove(struct tegra_dc *dc) { - int err; - if (!dc->rgb) return 0; - err = tegra_output_remove(dc->rgb); - if (err < 0) - return err; - + tegra_output_remove(dc->rgb); dc->rgb = NULL; return 0; @@ -342,8 +337,8 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) int tegra_dc_rgb_exit(struct tegra_dc *dc) { - if (!dc->rgb) - return 0; + if (dc->rgb) + tegra_output_exit(dc->rgb); - return tegra_output_exit(dc->rgb); + return 0; } -- cgit v1.2.3