drm/amd/amdgpu: get rid of else branch

else branch is pointless if it's right at the end of function and use
unlikely() on err path.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Nikola Pajkovsky <npajkovsky@suse.cz>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 23 insertions, 22 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 8e828cda9baa..3bd709600a15 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1734,30 +1734,31 @@ static inline void amdgpu_ring_write_multiple(struct amdgpu_ring *ring, void *sr
         unsigned occupied, chunk1, chunk2;
         void *dst;
 
-        if (ring->count_dw < count_dw) {
+        if (unlikely(ring->count_dw < count_dw)) {
                 DRM_ERROR("amdgpu: writing more dwords to the ring than expected!\n");
-        } else {
-                occupied = ring->wptr & ring->buf_mask;
-                dst = (void *)&ring->ring[occupied];
-                chunk1 = ring->buf_mask + 1 - occupied;
-                chunk1 = (chunk1 >= count_dw) ? count_dw: chunk1;
-                chunk2 = count_dw - chunk1;
-                chunk1 <<= 2;
-                chunk2 <<= 2;
-
-                if (chunk1)
-                        memcpy(dst, src, chunk1);
-
-                if (chunk2) {
-                        src += chunk1;
-                        dst = (void *)ring->ring;
-                        memcpy(dst, src, chunk2);
-                }
-
-                ring->wptr += count_dw;
-                ring->wptr &= ring->ptr_mask;
-                ring->count_dw -= count_dw;
+                return;
         }
+
+        occupied = ring->wptr & ring->buf_mask;
+        dst = (void *)&ring->ring[occupied];
+        chunk1 = ring->buf_mask + 1 - occupied;
+        chunk1 = (chunk1 >= count_dw) ? count_dw: chunk1;
+        chunk2 = count_dw - chunk1;
+        chunk1 <<= 2;
+        chunk2 <<= 2;
+
+        if (chunk1)
+                memcpy(dst, src, chunk1);
+
+        if (chunk2) {
+                src += chunk1;
+                dst = (void *)ring->ring;
+                memcpy(dst, src, chunk2);
+        }
+
+        ring->wptr += count_dw;
+        ring->wptr &= ring->ptr_mask;
+        ring->count_dw -= count_dw;
 }
 
 static inline struct amdgpu_sdma_instance *