Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 328ec69e authored by Thierry Reding's avatar Thierry Reding
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
parent ea130b24

drivers/gpu/drm/tegra/drm.h

+2 −2
Original line number Diff line number Diff line
@@ -213,9 +213,9 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc); 


/* from output.c */

int tegra_output_probe(struct tegra_output *output);

int tegra_output_remove(struct tegra_output *output);

void tegra_output_remove(struct tegra_output *output);

int tegra_output_init(struct drm_device *drm, struct tegra_output *output);

int tegra_output_exit(struct tegra_output *output);

void tegra_output_exit(struct tegra_output *output);



int tegra_output_connector_get_modes(struct drm_connector *connector);

struct drm_encoder *

drivers/gpu/drm/tegra/dsi.c

+1 −5
Original line number Diff line number Diff line
@@ -1577,11 +1577,7 @@ static int tegra_dsi_remove(struct platform_device *pdev) 
		return err;

	}



	err = tegra_output_remove(&dsi->output);

	if (err < 0) {

		dev_err(&pdev->dev, "failed to remove output: %d\n", err);

		return err;

	}

	tegra_output_remove(&dsi->output);



	mipi_dsi_host_unregister(&dsi->host);

	tegra_mipi_free(dsi->mipi);

drivers/gpu/drm/tegra/hdmi.c

+1 −5
Original line number Diff line number Diff line
@@ -1563,11 +1563,7 @@ static int tegra_hdmi_remove(struct platform_device *pdev) 
		return err;

	}



	err = tegra_output_remove(&hdmi->output);

	if (err < 0) {

		dev_err(&pdev->dev, "failed to remove output: %d\n", err);

		return err;

	}

	tegra_output_remove(&hdmi->output);



	clk_disable_unprepare(hdmi->clk_parent);

	clk_disable_unprepare(hdmi->clk);

drivers/gpu/drm/tegra/output.c

+2 −6
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int tegra_output_probe(struct tegra_output *output) 
	return 0;

}



int tegra_output_remove(struct tegra_output *output)

void tegra_output_remove(struct tegra_output *output)

{

	if (gpio_is_valid(output->hpd_gpio)) {

		free_irq(output->hpd_irq, output);
@@ -181,8 +181,6 @@ int tegra_output_remove(struct tegra_output *output) 


	if (output->ddc)

		put_device(&output->ddc->dev);



	return 0;

}



int tegra_output_init(struct drm_device *drm, struct tegra_output *output)
@@ -205,7 +203,7 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output) 
	return 0;

}



int tegra_output_exit(struct tegra_output *output)

void tegra_output_exit(struct tegra_output *output)

{

	/*

	 * The connector is going away, so the interrupt must be disabled to
@@ -216,6 +214,4 @@ int tegra_output_exit(struct tegra_output *output) 


	if (output->panel)

		drm_panel_detach(output->panel);



	return 0;

}

drivers/gpu/drm/tegra/rgb.c

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

}