diff --git a/drivers/infiniband/hw/hns/roce-customer/rdfx_entry.c b/drivers/infiniband/hw/hns/roce-customer/rdfx_entry.c
index a2453b31ac91750aee74cf113d903fee5dce0692..52cb9f7e088b4c4709eac7728d49475f3c4f38ef 100644
--- a/drivers/infiniband/hw/hns/roce-customer/rdfx_entry.c
+++ b/drivers/infiniband/hw/hns/roce-customer/rdfx_entry.c
@@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(rdfx_cp_rq_wqe_buf);
 
 #ifdef CONFIG_KERNEL_419
 static void rdfx_change_sq_buf(const struct ib_send_wr *wr, int atomic_en,
-			       void *dfx_qp_buf, void *dfx_hns_wqe_sge,
+			       void *dfx_qp_buf, const void *dfx_hns_wqe_sge,
 			       struct rdfx_sq_info *sq,
 			       struct hns_roce_dev *hr_dev,
 			       struct hns_roce_qp *qp)
@@ -88,10 +88,12 @@ static void rdfx_change_sq_buf(struct ib_send_wr *wr, int atomic_en,
 
 	atomic_set(&sq->head, (int)qp->sq.head);
 	sq->head_addr =
-		(u64)get_send_wqe(qp, qp->sq.head & (qp->sq.wqe_cnt - 1));
+		(u64)get_send_wqe(qp, qp->sq.head &
+		    (unsigned int)(qp->sq.wqe_cnt - 1));
 	atomic_set(&sq->tail, (int)qp->sq.tail);
 	sq->tail_addr =
-		(u64)get_send_wqe(qp, qp->sq.tail & (qp->sq.wqe_cnt - 1));
+		(u64)get_send_wqe(qp, qp->sq.tail &
+		    (unsigned int)(qp->sq.wqe_cnt - 1));
 }
 
 #ifdef CONFIG_KERNEL_419
diff --git a/drivers/infiniband/hw/hns/roce-customer/rdfx_sysfs.c b/drivers/infiniband/hw/hns/roce-customer/rdfx_sysfs.c
index 322b1077b485ee714c574c812d1bdfe11e2ddf42..283705ae93ae811e782a67d71d1f9c504c8e1c71 100644
--- a/drivers/infiniband/hw/hns/roce-customer/rdfx_sysfs.c
+++ b/drivers/infiniband/hw/hns/roce-customer/rdfx_sysfs.c
@@ -211,7 +211,7 @@ static int show_cqe(struct rdfx_cq_info *rdfx_cq, int cqe_index)
 	return 0;
 }
 
-static inline int rdfx_convert_str(char *str, u32 *val)
+static inline int rdfx_convert_str(const char *str, u32 *val)
 {
 	long long convert_val;
 
@@ -224,7 +224,7 @@ static inline int rdfx_convert_str(char *str, u32 *val)
 	return 0;
 }
 
-static inline int rdfx_show_qp_wqe(char *sq_rq, void *buf, u32 qpn,
+static inline int rdfx_show_qp_wqe(const char *sq_rq, void *buf, u32 qpn,
 				   struct rdfx_info *rdfx)
 {
 	struct rdfx_qp_info *rdfx_qp;
@@ -401,7 +401,7 @@ static inline int rdfx_show_cq_detail(u32 cqn, struct rdfx_info *rdfx)
 {
 	struct rdfx_cq_info *rdfx_cq = NULL;
 	struct hns_roce_dev *hr_dev;
-	struct hns_roce_cq *cq;
+	struct hns_roce_cq *cq = NULL;
 
 	hr_dev = (struct hns_roce_dev *)rdfx->priv;
 
@@ -414,7 +414,7 @@ static inline int rdfx_show_cq_detail(u32 cqn, struct rdfx_info *rdfx)
 		atomic_read(&rdfx->cq.top_cq_index));
 
 	cq = radix_tree_lookup(&hr_dev->cq_table.tree,
-			       cqn & (hr_dev->caps.num_cqs - 1));
+			       cqn & (u32)(hr_dev->caps.num_cqs - 1));
 	if (cq)
 		pr_info("arm_sn_cnt       : 0x%x\n", cq->arm_sn);