RDMA/hns: Remove unused parameters and variables

[ Upstream commit f4caa864af84f801a5821ea2ba6c1cc46f8252c1 ]

Remove unused parameters and variables.

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
Link: https://lore.kernel.org/r/20240412091616.370789-3-huangjunxian6@hisilicon.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Stable-dep-of: 8673a6c2d9e4 ("RDMA/hns: Fix mapping error of zero-hop WQE buffer")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/hns/hns_roce_alloc.c b/drivers/infiniband/hw/hns/hns_roce_alloc.c
index 11a78ceae56891c654fe4d8086b536052eba7e47..950c133d4220e7f153a2a0db8dae524fc4162713 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_alloc.c
+++ b/drivers/infiniband/hw/hns/hns_roce_alloc.c
@@ -153,8 +153,7 @@ int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,
        return total;
 }
 
-int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,
-                          int buf_cnt, struct ib_umem *umem,
+int hns_roce_get_umem_bufs(dma_addr_t *bufs, int buf_cnt, struct ib_umem *umem,
                           unsigned int page_shift)
 {
        struct ib_block_iter biter;

diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index 461008bf0fcf89634a99e53bc068e03b94b3f4ac..0607970013536e6ec87ff7609aa1f8a30e9acb58 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -882,8 +882,7 @@ struct hns_roce_hw {
        int (*rereg_write_mtpt)(struct hns_roce_dev *hr_dev,
                                struct hns_roce_mr *mr, int flags,
                                void *mb_buf);
-       int (*frmr_write_mtpt)(struct hns_roce_dev *hr_dev, void *mb_buf,
-                              struct hns_roce_mr *mr);
+       int (*frmr_write_mtpt)(void *mb_buf, struct hns_roce_mr *mr);
        int (*mw_write_mtpt)(void *mb_buf, struct hns_roce_mw *mw);
        void (*write_cqc)(struct hns_roce_dev *hr_dev,
                          struct hns_roce_cq *hr_cq, void *mb_buf, u64 *mtts,
@@ -1182,7 +1181,7 @@ struct hns_roce_buf *hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size,
 int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,
                           int buf_cnt, struct hns_roce_buf *buf,
                           unsigned int page_shift);
-int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,
+int hns_roce_get_umem_bufs(dma_addr_t *bufs,
                           int buf_cnt, struct ib_umem *umem,
                           unsigned int page_shift);
 

diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.c b/drivers/infiniband/hw/hns/hns_roce_hem.c
index f605eb8fd13a2af3b97321366afd9180a5635f37..6e0ca8a4b2a8969024c22c8370ff0146f2a1399d 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hem.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hem.c
@@ -1043,15 +1043,13 @@ static void hem_list_free_all(struct hns_roce_dev *hr_dev,
        }
 }
 
-static void hem_list_link_bt(struct hns_roce_dev *hr_dev, void *base_addr,
-                            u64 table_addr)
+static void hem_list_link_bt(void *base_addr, u64 table_addr)
 {
        *(u64 *)(base_addr) = table_addr;
 }
 
 /* assign L0 table address to hem from root bt */
-static void hem_list_assign_bt(struct hns_roce_dev *hr_dev,
-                              struct hns_roce_hem_item *hem, void *cpu_addr,
+static void hem_list_assign_bt(struct hns_roce_hem_item *hem, void *cpu_addr,
                               u64 phy_addr)
 {
        hem->addr = cpu_addr;
@@ -1222,8 +1220,7 @@ static int hem_list_alloc_mid_bt(struct hns_roce_dev *hr_dev,
                if (level > 1) {
                        pre = hem_ptrs[level - 1];
                        step = (cur->start - pre->start) / step * BA_BYTE_LEN;
-                       hem_list_link_bt(hr_dev, pre->addr + step,
-                                        cur->dma_addr);
+                       hem_list_link_bt(pre->addr + step, cur->dma_addr);
                }
        }
 
@@ -1281,7 +1278,7 @@ static int alloc_fake_root_bt(struct hns_roce_dev *hr_dev, void *cpu_base,
        if (!hem)
                return -ENOMEM;
 
-       hem_list_assign_bt(hr_dev, hem, cpu_base, phy_base);
+       hem_list_assign_bt(hem, cpu_base, phy_base);
        list_add(&hem->list, branch_head);
        list_add(&hem->sibling, leaf_head);
 
@@ -1304,7 +1301,7 @@ static int setup_middle_bt(struct hns_roce_dev *hr_dev, void *cpu_base,
        /* if exist mid bt, link L1 to L0 */
        list_for_each_entry_safe(hem, temp_hem, branch_head, list) {
                offset = (hem->start - r->offset) / step * BA_BYTE_LEN;
-               hem_list_link_bt(hr_dev, cpu_base + offset, hem->dma_addr);
+               hem_list_link_bt(cpu_base + offset, hem->dma_addr);
                total++;
        }
 

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 105ad0aec922c531c1c26f7e2776cf27e6214b41..60628ef1c46ee20baad815837775db2cbb956cb4 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -3400,8 +3400,7 @@ static int hns_roce_v2_rereg_write_mtpt(struct hns_roce_dev *hr_dev,
        return ret;
 }
 
-static int hns_roce_v2_frmr_write_mtpt(struct hns_roce_dev *hr_dev,
-                                      void *mb_buf, struct hns_roce_mr *mr)
+static int hns_roce_v2_frmr_write_mtpt(void *mb_buf, struct hns_roce_mr *mr)
 {
        dma_addr_t pbl_ba = hns_roce_get_mtr_ba(&mr->pbl_mtr);
        struct hns_roce_v2_mpt_entry *mpt_entry;
@@ -4367,8 +4366,7 @@ static void set_access_flags(struct hns_roce_qp *hr_qp,
 }
 
 static void set_qpc_wqe_cnt(struct hns_roce_qp *hr_qp,
-                           struct hns_roce_v2_qp_context *context,
-                           struct hns_roce_v2_qp_context *qpc_mask)
+                           struct hns_roce_v2_qp_context *context)
 {
        hr_reg_write(context, QPC_SGE_SHIFT,
                     to_hr_hem_entries_shift(hr_qp->sge.sge_cnt,
@@ -4390,7 +4388,6 @@ static inline int get_pdn(struct ib_pd *ib_pd)
 }
 
 static void modify_qp_reset_to_init(struct ib_qp *ibqp,
-                                   const struct ib_qp_attr *attr,
                                    struct hns_roce_v2_qp_context *context,
                                    struct hns_roce_v2_qp_context *qpc_mask)
 {
@@ -4409,7 +4406,7 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
 
        hr_reg_write(context, QPC_RQWS, ilog2(hr_qp->rq.max_gs));
 
-       set_qpc_wqe_cnt(hr_qp, context, qpc_mask);
+       set_qpc_wqe_cnt(hr_qp, context);
 
        /* No VLAN need to set 0xFFF */
        hr_reg_write(context, QPC_VLAN_ID, 0xfff);
@@ -4454,7 +4451,6 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
 }
 
 static void modify_qp_init_to_init(struct ib_qp *ibqp,
-                                  const struct ib_qp_attr *attr,
                                   struct hns_roce_v2_qp_context *context,
                                   struct hns_roce_v2_qp_context *qpc_mask)
 {
@@ -4752,8 +4748,7 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
        return 0;
 }
 
-static int modify_qp_rtr_to_rts(struct ib_qp *ibqp,
-                               const struct ib_qp_attr *attr, int attr_mask,
+static int modify_qp_rtr_to_rts(struct ib_qp *ibqp, int attr_mask,
                                struct hns_roce_v2_qp_context *context,
                                struct hns_roce_v2_qp_context *qpc_mask)
 {
@@ -5121,15 +5116,14 @@ static int hns_roce_v2_set_abs_fields(struct ib_qp *ibqp,
 
        if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT) {
                memset(qpc_mask, 0, hr_dev->caps.qpc_sz);
-               modify_qp_reset_to_init(ibqp, attr, context, qpc_mask);
+               modify_qp_reset_to_init(ibqp, context, qpc_mask);
        } else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_INIT) {
-               modify_qp_init_to_init(ibqp, attr, context, qpc_mask);
+               modify_qp_init_to_init(ibqp, context, qpc_mask);
        } else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) {
                ret = modify_qp_init_to_rtr(ibqp, attr, attr_mask, context,
                                            qpc_mask);
        } else if (cur_state == IB_QPS_RTR && new_state == IB_QPS_RTS) {
-               ret = modify_qp_rtr_to_rts(ibqp, attr, attr_mask, context,
-                                          qpc_mask);
+               ret = modify_qp_rtr_to_rts(ibqp, attr_mask, context, qpc_mask);
        }
 
        return ret;

diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c
index 7b59b95f87c29d849a3b7fe7b73d12ce65252a94..acdcd5c9f42f8992a8d6c49641176d27595be6d5 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_mr.c
+++ b/drivers/infiniband/hw/hns/hns_roce_mr.c
@@ -154,7 +154,7 @@ static int hns_roce_mr_enable(struct hns_roce_dev *hr_dev,
        if (mr->type != MR_TYPE_FRMR)
                ret = hr_dev->hw->write_mtpt(hr_dev, mailbox->buf, mr);
        else
-               ret = hr_dev->hw->frmr_write_mtpt(hr_dev, mailbox->buf, mr);
+               ret = hr_dev->hw->frmr_write_mtpt(mailbox->buf, mr);
        if (ret) {
                dev_err(dev, "failed to write mtpt, ret = %d.\n", ret);
                goto err_page;
@@ -714,7 +714,7 @@ static int mtr_map_bufs(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr,
                return -ENOMEM;
 
        if (mtr->umem)
-               npage = hns_roce_get_umem_bufs(hr_dev, pages, page_count,
+               npage = hns_roce_get_umem_bufs(pages, page_count,
                                               mtr->umem, page_shift);
        else
                npage = hns_roce_get_kmem_bufs(hr_dev, pages, page_count,

diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c
index 7af6631761044c3ac717412f18820ad539b08292..19136cb169600f11eb0558ad49ce65a2f97f8cd2 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_qp.c
+++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -1139,7 +1139,6 @@ static int set_qp_param(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp,
 }
 
 static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev,
-                                    struct ib_pd *ib_pd,
                                     struct ib_qp_init_attr *init_attr,
                                     struct ib_udata *udata,
                                     struct hns_roce_qp *hr_qp)
@@ -1293,7 +1292,6 @@ int hns_roce_create_qp(struct ib_qp *qp, struct ib_qp_init_attr *init_attr,
        struct ib_device *ibdev = qp->device;
        struct hns_roce_dev *hr_dev = to_hr_dev(ibdev);
        struct hns_roce_qp *hr_qp = to_hr_qp(qp);
-       struct ib_pd *pd = qp->pd;
        int ret;
 
        ret = check_qp_type(hr_dev, init_attr->qp_type, !!udata);
@@ -1308,7 +1306,7 @@ int hns_roce_create_qp(struct ib_qp *qp, struct ib_qp_init_attr *init_attr,
                hr_qp->phy_port = hr_dev->iboe.phy_port[hr_qp->port];
        }
 
-       ret = hns_roce_create_qp_common(hr_dev, pd, init_attr, udata, hr_qp);
+       ret = hns_roce_create_qp_common(hr_dev, init_attr, udata, hr_qp);
        if (ret)
                ibdev_err(ibdev, "create QP type 0x%x failed(%d)\n",
                          init_attr->qp_type, ret);

diff --git a/drivers/infiniband/hw/hns/hns_roce_srq.c b/drivers/infiniband/hw/hns/hns_roce_srq.c
index 652508b660a060d6b54a55cb7d9c92e0c02771d7..80fcb1b0e8fdcfcc70960f71b91484ebf1042266 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@ -249,7 +249,7 @@ static void free_srq_wqe_buf(struct hns_roce_dev *hr_dev,
        hns_roce_mtr_destroy(hr_dev, &srq->buf_mtr);
 }
 
-static int alloc_srq_wrid(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq)
+static int alloc_srq_wrid(struct hns_roce_srq *srq)
 {
        srq->wrid = kvmalloc_array(srq->wqe_cnt, sizeof(u64), GFP_KERNEL);
        if (!srq->wrid)
@@ -365,7 +365,7 @@ static int alloc_srq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq,
                goto err_idx;
 
        if (!udata) {
-               ret = alloc_srq_wrid(hr_dev, srq);
+               ret = alloc_srq_wrid(srq);
                if (ret)
                        goto err_wqe_buf;
        }