Merge existing fixes from regulator/for-5.10

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / cik_ih.c

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
index 401c99f0b2d0018d80fa2aac4606d767278a821b..db953e95f3d27063da8bfcc2f4e50ea7556f0886 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
@@ -316,14 +316,9 @@ static int cik_ih_sw_fini(void *handle)
 
 static int cik_ih_hw_init(void *handle)
 {
-       int r;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-       r = cik_ih_irq_init(adev);
-       if (r)
-               return r;
-
-       return 0;
+       return cik_ih_irq_init(adev);
 }
 
 static int cik_ih_hw_fini(void *handle)