2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/i40iw/i40iw_d.h b/drivers/infiniband/hw/i40iw/i40iw_d.h
index bd942da91a27..2fac1db0e0a0 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_d.h
+++ b/drivers/infiniband/hw/i40iw/i40iw_d.h
@@ -1557,6 +1557,9 @@ enum i40iw_alignment {
 #define I40IW_RING_MOVE_TAIL(_ring) \
         (_ring).tail = ((_ring).tail + 1) % (_ring).size
 
+#define I40IW_RING_MOVE_HEAD_NOCHECK(_ring) \
+        (_ring).head = ((_ring).head + 1) % (_ring).size
+
 #define I40IW_RING_MOVE_TAIL_BY_COUNT(_ring, _count) \
         (_ring).tail = ((_ring).tail + (_count)) % (_ring).size
 
diff --git a/drivers/infiniband/hw/i40iw/i40iw_uk.c b/drivers/infiniband/hw/i40iw/i40iw_uk.c
index 6b217e6e918f..4d28c3cb03cc 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_uk.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_uk.c
@@ -761,7 +761,6 @@ static enum i40iw_status_code i40iw_cq_poll_completion(struct i40iw_cq_uk *cq,
         struct i40iw_ring *pring = NULL;
         u32 wqe_idx, q_type, array_idx = 0;
         enum i40iw_status_code ret_code = 0;
-        enum i40iw_status_code ret_code2 = 0;
         bool move_cq_head = true;
         u8 polarity;
         u8 addl_wqes = 0;
@@ -869,10 +868,7 @@ exit:
                         move_cq_head = false;
 
         if (move_cq_head) {
-                I40IW_RING_MOVE_HEAD(cq->cq_ring, ret_code2);
-
-                if (ret_code2 && !ret_code)
-                        ret_code = ret_code2;
+                I40IW_RING_MOVE_HEAD_NOCHECK(cq->cq_ring);
 
                 if (I40IW_RING_GETCURRENT_HEAD(cq->cq_ring) == 0)
                         cq->polarity ^= 1;