aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/tegra/sor.c
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-12-19 15:55:08 +0100
committerThierry Reding <treding@nvidia.com>2015-01-27 10:14:49 +0100
commit328ec69e7f9e7192c3f7653a5ec46d6e9a5fe60d (patch)
tree3843a5707acfdffd7affd56cc570bba3c757de98 /drivers/gpu/drm/tegra/sor.c
parentdrm/tegra: Remove remnants of the output midlayer (diff)
downloadlinux-dev-328ec69e7f9e7192c3f7653a5ec46d6e9a5fe60d.tar.xz
linux-dev-328ec69e7f9e7192c3f7653a5ec46d6e9a5fe60d.zip
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 <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/tegra/sor.c')
-rw-r--r--drivers/gpu/drm/tegra/sor.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index ee18adf7f653..9e67838c1562 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -1396,6 +1396,8 @@ static int tegra_sor_exit(struct host1x_client *client)
struct tegra_sor *sor = host1x_client_to_sor(client);
int err;
+ tegra_output_exit(&sor->output);
+
if (sor->dpaux) {
err = tegra_dpaux_detach(sor->dpaux);
if (err < 0) {
@@ -1500,11 +1502,7 @@ static int tegra_sor_remove(struct platform_device *pdev)
return err;
}
- err = tegra_output_remove(&sor->output);
- if (err < 0) {
- dev_err(&pdev->dev, "failed to remove output: %d\n", err);
- return err;
- }
+ tegra_output_remove(&sor->output);
return 0;
}