diff --git a/drivers/infiniband/hw/hns/hns_roce_cq.c b/drivers/infiniband/hw/hns/hns_roce_cq.c
index 7cda55debe62dc06741ffa4410d3417f64a76c3e..c717c00c58e1a34626344410e001d95fa507af8b 100644
--- a/drivers/infiniband/hw/hns/hns_roce_cq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_cq.c
@@ -239,7 +239,6 @@ static void free_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq)
 				    ret, hr_cq->cqn);
 	}
 
-	xa_erase(&cq_table->array, hr_cq->cqn);
 	xa_erase_irq(&cq_table->array, hr_cq->cqn);
 
 	/* Waiting interrupt process procedure carried out */
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 43c3c247e82f3c09c0224a1697d6d521e3294caa..1950fed72c38d6b3494dec85f625bdfb6e0ee96f 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -167,22 +167,15 @@ static void set_frmr_seg(struct hns_roce_v2_rc_send_wqe *rc_sq_wqe,
 	hr_reg_clear(fseg, FRMR_BLK_MODE);
 }
 
-static int set_atomic_seg(struct hns_roce_dev *hr_dev,
-			  const struct ib_send_wr *wr,
-			  struct hns_roce_v2_rc_send_wqe *rc_sq_wqe,
-			  unsigned int valid_num_sge, u32 msg_len)
+static void set_atomic_seg(const struct ib_send_wr *wr,
+			   struct hns_roce_v2_rc_send_wqe *rc_sq_wqe,
+			   unsigned int valid_num_sge)
 {
 	struct hns_roce_v2_wqe_data_seg *dseg =
 		(void *)rc_sq_wqe + sizeof(struct hns_roce_v2_rc_send_wqe);
 	struct hns_roce_wqe_atomic_seg *aseg =
 		(void *)dseg + sizeof(struct hns_roce_v2_wqe_data_seg);
 
-	if (msg_len != ATOMIC_WR_LEN) {
-		ibdev_err(&hr_dev->ib_dev, "invalid atomic wr len, len = %u.\n",
-			  msg_len);
-		return -EINVAL;
-	}
-
 	set_data_seg_v2(dseg, wr->sg_list);
 
 	if (wr->opcode == IB_WR_ATOMIC_CMP_AND_SWP) {
@@ -195,8 +188,6 @@ static int set_atomic_seg(struct hns_roce_dev *hr_dev,
 	}
 
 	hr_reg_write(rc_sq_wqe, RC_SEND_WQE_SGE_NUM, valid_num_sge);
-
-	return 0;
 }
 
 static int fill_ext_sge_inl_data(struct hns_roce_qp *qp,
@@ -686,14 +677,14 @@ static inline int set_rc_wqe(struct hns_roce_qp *qp,
 	    wr->opcode == IB_WR_ATOMIC_FETCH_AND_ADD) {
 		if (msg_len != ATOMIC_WR_LEN)
 			return -EINVAL;
-		ret = set_atomic_seg(hr_dev, wr, rc_sq_wqe, valid_num_sge,
-				     msg_len);
+		set_atomic_seg(wr, rc_sq_wqe, valid_num_sge);
 	} else if (wr->opcode != IB_WR_REG_MR) {
 		ret = set_rwqe_data_seg(&qp->ibqp, wr, rc_sq_wqe,
 					&curr_idx, valid_num_sge);
 		if (ret)
 			return ret;
 	}
+
 	if (qp->en_flags & HNS_ROCE_QP_CAP_DYNAMIC_CTX_ATTACH)
 		fill_dca_fields(qp, rc_sq_wqe);