Skip to content

Commit f4caa86

Browse files
Chengchang Tangrleon
Chengchang Tang
authored and
rleon
committed
RDMA/hns: Remove unused parameters and variables
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>
1 parent bfb6be4 commit f4caa86

7 files changed

Lines changed: 20 additions & 33 deletions

File tree

‎drivers/infiniband/hw/hns/hns_roce_alloc.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,
153153
return total;
154154
}
155155

156-
int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,
157-
int buf_cnt, struct ib_umem *umem,
156+
int hns_roce_get_umem_bufs(dma_addr_t *bufs, int buf_cnt, struct ib_umem *umem,
158157
unsigned int page_shift)
159158
{
160159
struct ib_block_iter biter;

‎drivers/infiniband/hw/hns/hns_roce_device.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -925,8 +925,7 @@ struct hns_roce_hw {
925925
int (*rereg_write_mtpt)(struct hns_roce_dev *hr_dev,
926926
struct hns_roce_mr *mr, int flags,
927927
void *mb_buf);
928-
int (*frmr_write_mtpt)(struct hns_roce_dev *hr_dev, void *mb_buf,
929-
struct hns_roce_mr *mr);
928+
int (*frmr_write_mtpt)(void *mb_buf, struct hns_roce_mr *mr);
930929
int (*mw_write_mtpt)(void *mb_buf, struct hns_roce_mw *mw);
931930
void (*write_cqc)(struct hns_roce_dev *hr_dev,
932931
struct hns_roce_cq *hr_cq, void *mb_buf, u64 *mtts,
@@ -1232,7 +1231,7 @@ struct hns_roce_buf *hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size,
12321231
int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,
12331232
int buf_cnt, struct hns_roce_buf *buf,
12341233
unsigned int page_shift);
1235-
int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,
1234+
int hns_roce_get_umem_bufs(dma_addr_t *bufs,
12361235
int buf_cnt, struct ib_umem *umem,
12371236
unsigned int page_shift);
12381237

‎drivers/infiniband/hw/hns/hns_roce_hem.c‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -986,15 +986,13 @@ static void hem_list_free_all(struct hns_roce_dev *hr_dev,
986986
}
987987
}
988988

989-
static void hem_list_link_bt(struct hns_roce_dev *hr_dev, void *base_addr,
990-
u64 table_addr)
989+
static void hem_list_link_bt(void *base_addr, u64 table_addr)
991990
{
992991
*(u64 *)(base_addr) = table_addr;
993992
}
994993

995994
/* assign L0 table address to hem from root bt */
996-
static void hem_list_assign_bt(struct hns_roce_dev *hr_dev,
997-
struct hns_roce_hem_item *hem, void *cpu_addr,
995+
static void hem_list_assign_bt(struct hns_roce_hem_item *hem, void *cpu_addr,
998996
u64 phy_addr)
999997
{
1000998
hem->addr = cpu_addr;
@@ -1163,8 +1161,7 @@ static int hem_list_alloc_mid_bt(struct hns_roce_dev *hr_dev,
11631161
if (level > 1) {
11641162
pre = hem_ptrs[level - 1];
11651163
step = (cur->start - pre->start) / step * BA_BYTE_LEN;
1166-
hem_list_link_bt(hr_dev, pre->addr + step,
1167-
cur->dma_addr);
1164+
hem_list_link_bt(pre->addr + step, cur->dma_addr);
11681165
}
11691166
}
11701167

@@ -1222,7 +1219,7 @@ static int alloc_fake_root_bt(struct hns_roce_dev *hr_dev, void *cpu_base,
12221219
if (!hem)
12231220
return -ENOMEM;
12241221

1225-
hem_list_assign_bt(hr_dev, hem, cpu_base, phy_base);
1222+
hem_list_assign_bt(hem, cpu_base, phy_base);
12261223
list_add(&hem->list, branch_head);
12271224
list_add(&hem->sibling, leaf_head);
12281225

@@ -1245,7 +1242,7 @@ static int setup_middle_bt(struct hns_roce_dev *hr_dev, void *cpu_base,
12451242
/* if exist mid bt, link L1 to L0 */
12461243
list_for_each_entry_safe(hem, temp_hem, branch_head, list) {
12471244
offset = (hem->start - r->offset) / step * BA_BYTE_LEN;
1248-
hem_list_link_bt(hr_dev, cpu_base + offset, hem->dma_addr);
1245+
hem_list_link_bt(cpu_base + offset, hem->dma_addr);
12491246
total++;
12501247
}
12511248

‎drivers/infiniband/hw/hns/hns_roce_hw_v2.c‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3304,8 +3304,7 @@ static int hns_roce_v2_rereg_write_mtpt(struct hns_roce_dev *hr_dev,
33043304
return ret;
33053305
}
33063306

3307-
static int hns_roce_v2_frmr_write_mtpt(struct hns_roce_dev *hr_dev,
3308-
void *mb_buf, struct hns_roce_mr *mr)
3307+
static int hns_roce_v2_frmr_write_mtpt(void *mb_buf, struct hns_roce_mr *mr)
33093308
{
33103309
dma_addr_t pbl_ba = hns_roce_get_mtr_ba(&mr->pbl_mtr);
33113310
struct hns_roce_v2_mpt_entry *mpt_entry;
@@ -4216,8 +4215,7 @@ static void set_access_flags(struct hns_roce_qp *hr_qp,
42164215
}
42174216

42184217
static void set_qpc_wqe_cnt(struct hns_roce_qp *hr_qp,
4219-
struct hns_roce_v2_qp_context *context,
4220-
struct hns_roce_v2_qp_context *qpc_mask)
4218+
struct hns_roce_v2_qp_context *context)
42214219
{
42224220
hr_reg_write(context, QPC_SGE_SHIFT,
42234221
to_hr_hem_entries_shift(hr_qp->sge.sge_cnt,
@@ -4239,7 +4237,6 @@ static inline int get_pdn(struct ib_pd *ib_pd)
42394237
}
42404238

42414239
static void modify_qp_reset_to_init(struct ib_qp *ibqp,
4242-
const struct ib_qp_attr *attr,
42434240
struct hns_roce_v2_qp_context *context,
42444241
struct hns_roce_v2_qp_context *qpc_mask)
42454242
{
@@ -4258,7 +4255,7 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
42584255

42594256
hr_reg_write(context, QPC_RQWS, ilog2(hr_qp->rq.max_gs));
42604257

4261-
set_qpc_wqe_cnt(hr_qp, context, qpc_mask);
4258+
set_qpc_wqe_cnt(hr_qp, context);
42624259

42634260
/* No VLAN need to set 0xFFF */
42644261
hr_reg_write(context, QPC_VLAN_ID, 0xfff);
@@ -4299,7 +4296,6 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
42994296
}
43004297

43014298
static void modify_qp_init_to_init(struct ib_qp *ibqp,
4302-
const struct ib_qp_attr *attr,
43034299
struct hns_roce_v2_qp_context *context,
43044300
struct hns_roce_v2_qp_context *qpc_mask)
43054301
{
@@ -4619,8 +4615,7 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
46194615
return 0;
46204616
}
46214617

4622-
static int modify_qp_rtr_to_rts(struct ib_qp *ibqp,
4623-
const struct ib_qp_attr *attr, int attr_mask,
4618+
static int modify_qp_rtr_to_rts(struct ib_qp *ibqp, int attr_mask,
46244619
struct hns_roce_v2_qp_context *context,
46254620
struct hns_roce_v2_qp_context *qpc_mask)
46264621
{
@@ -5034,15 +5029,14 @@ static int hns_roce_v2_set_abs_fields(struct ib_qp *ibqp,
50345029

50355030
if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT) {
50365031
memset(qpc_mask, 0, hr_dev->caps.qpc_sz);
5037-
modify_qp_reset_to_init(ibqp, attr, context, qpc_mask);
5032+
modify_qp_reset_to_init(ibqp, context, qpc_mask);
50385033
} else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_INIT) {
5039-
modify_qp_init_to_init(ibqp, attr, context, qpc_mask);
5034+
modify_qp_init_to_init(ibqp, context, qpc_mask);
50405035
} else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) {
50415036
ret = modify_qp_init_to_rtr(ibqp, attr, attr_mask, context,
50425037
qpc_mask, udata);
50435038
} else if (cur_state == IB_QPS_RTR && new_state == IB_QPS_RTS) {
5044-
ret = modify_qp_rtr_to_rts(ibqp, attr, attr_mask, context,
5045-
qpc_mask);
5039+
ret = modify_qp_rtr_to_rts(ibqp, attr_mask, context, qpc_mask);
50465040
}
50475041

50485042
return ret;

‎drivers/infiniband/hw/hns/hns_roce_mr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static int hns_roce_mr_enable(struct hns_roce_dev *hr_dev,
162162
if (mr->type != MR_TYPE_FRMR)
163163
ret = hr_dev->hw->write_mtpt(hr_dev, mailbox->buf, mr);
164164
else
165-
ret = hr_dev->hw->frmr_write_mtpt(hr_dev, mailbox->buf, mr);
165+
ret = hr_dev->hw->frmr_write_mtpt(mailbox->buf, mr);
166166
if (ret) {
167167
dev_err(dev, "failed to write mtpt, ret = %d.\n", ret);
168168
goto err_page;
@@ -755,7 +755,7 @@ static int mtr_map_bufs(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr)
755755
return -ENOMEM;
756756

757757
if (mtr->umem)
758-
npage = hns_roce_get_umem_bufs(hr_dev, pages, page_count,
758+
npage = hns_roce_get_umem_bufs(pages, page_count,
759759
mtr->umem, page_shift);
760760
else
761761
npage = hns_roce_get_kmem_bufs(hr_dev, pages, page_count,

‎drivers/infiniband/hw/hns/hns_roce_qp.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,6 @@ static int set_qp_param(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp,
11181118
}
11191119

11201120
static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev,
1121-
struct ib_pd *ib_pd,
11221121
struct ib_qp_init_attr *init_attr,
11231122
struct ib_udata *udata,
11241123
struct hns_roce_qp *hr_qp)
@@ -1272,7 +1271,6 @@ int hns_roce_create_qp(struct ib_qp *qp, struct ib_qp_init_attr *init_attr,
12721271
struct ib_device *ibdev = qp->device;
12731272
struct hns_roce_dev *hr_dev = to_hr_dev(ibdev);
12741273
struct hns_roce_qp *hr_qp = to_hr_qp(qp);
1275-
struct ib_pd *pd = qp->pd;
12761274
int ret;
12771275

12781276
ret = check_qp_type(hr_dev, init_attr->qp_type, !!udata);
@@ -1287,7 +1285,7 @@ int hns_roce_create_qp(struct ib_qp *qp, struct ib_qp_init_attr *init_attr,
12871285
hr_qp->phy_port = hr_dev->iboe.phy_port[hr_qp->port];
12881286
}
12891287

1290-
ret = hns_roce_create_qp_common(hr_dev, pd, init_attr, udata, hr_qp);
1288+
ret = hns_roce_create_qp_common(hr_dev, init_attr, udata, hr_qp);
12911289
if (ret)
12921290
ibdev_err(ibdev, "create QP type 0x%x failed(%d)\n",
12931291
init_attr->qp_type, ret);

‎drivers/infiniband/hw/hns/hns_roce_srq.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static void free_srq_wqe_buf(struct hns_roce_dev *hr_dev,
250250
hns_roce_mtr_destroy(hr_dev, &srq->buf_mtr);
251251
}
252252

253-
static int alloc_srq_wrid(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq)
253+
static int alloc_srq_wrid(struct hns_roce_srq *srq)
254254
{
255255
srq->wrid = kvmalloc_array(srq->wqe_cnt, sizeof(u64), GFP_KERNEL);
256256
if (!srq->wrid)
@@ -366,7 +366,7 @@ static int alloc_srq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq,
366366
goto err_idx;
367367

368368
if (!udata) {
369-
ret = alloc_srq_wrid(hr_dev, srq);
369+
ret = alloc_srq_wrid(srq);
370370
if (ret)
371371
goto err_wqe_buf;
372372
}

0 commit comments

Comments
 (0)