drm/amdgpu: various cleanups for uvd/vce.

[linux-2.6-block.git] / drivers / gpu / drm / amd / amdgpu / vce_v4_0.c

diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
index becc5f744a98fe83e62dabb8ae56bd88e34065e7..2a3db99fbf1ee1f16ed262c134579930c560ab13 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
@@ -527,11 +527,7 @@ static int vce_v4_0_sw_fini(void *handle)
        if (r)
                return r;
 
-       r = amdgpu_vce_sw_fini(adev);
-       if (r)
-               return r;
-
-       return r;
+       return amdgpu_vce_sw_fini(adev);
 }
 
 static int vce_v4_0_hw_init(void *handle)
@@ -584,11 +580,7 @@ static int vce_v4_0_suspend(void *handle)
        if (r)
                return r;
 
-       r = amdgpu_vce_suspend(adev);
-       if (r)
-               return r;
-
-       return r;
+       return amdgpu_vce_suspend(adev);
 }
 
 static int vce_v4_0_resume(void *handle)
@@ -600,11 +592,7 @@ static int vce_v4_0_resume(void *handle)
        if (r)
                return r;
 
-       r = vce_v4_0_hw_init(adev);
-       if (r)
-               return r;
-
-       return r;
+       return vce_v4_0_hw_init(adev);
 }
 
 static void vce_v4_0_mc_resume(struct amdgpu_device *adev)