openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB/rxe: remove unused function variable 

In the functions rxe_mem_init_dma, rxe_mem_init_user, rxe_mem_init_fast
and copy_data, the function variable rxe is not used. So this function
variable rxe is removed.

CC: Srinivas Eeda <srinivas.eeda@oracle.com>
CC: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Zhu Yanjun 2018-04-23 03:57:58 -04:00 committed by Doug Ledford
parent 0dff463a6a
commit e12ee8ce51
6 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/sw/rxe/rxe_comp.c
View File

@ -355,10 +355,9 @@ static inline enum comp_state do_read(struct rxe_qp *qp,
struct rxe_pkt_info *pkt, struct rxe_pkt_info *pkt,
struct rxe_send_wqe *wqe) struct rxe_send_wqe *wqe)
{ {
struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
int ret; int ret;
ret = copy_data(rxe, qp->pd, IB_ACCESS_LOCAL_WRITE, ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,
&wqe->dma, payload_addr(pkt), &wqe->dma, payload_addr(pkt),
payload_size(pkt), to_mem_obj, NULL); payload_size(pkt), to_mem_obj, NULL);
if (ret) if (ret)
@ -374,12 +373,11 @@ static inline enum comp_state do_atomic(struct rxe_qp *qp,
struct rxe_pkt_info *pkt, struct rxe_pkt_info *pkt,
struct rxe_send_wqe *wqe) struct rxe_send_wqe *wqe)
{ {
struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
int ret; int ret;
u64 atomic_orig = atmack_orig(pkt); u64 atomic_orig = atmack_orig(pkt);
ret = copy_data(rxe, qp->pd, IB_ACCESS_LOCAL_WRITE, ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,
&wqe->dma, &atomic_orig, &wqe->dma, &atomic_orig,
sizeof(u64), to_mem_obj, NULL); sizeof(u64), to_mem_obj, NULL);
if (ret) if (ret)

8
drivers/infiniband/sw/rxe/rxe_loc.h
View File

@ -106,20 +106,20 @@ enum copy_direction {
from_mem_obj, from_mem_obj,
}; };
int rxe_mem_init_dma(struct rxe_dev *rxe, struct rxe_pd *pd, int rxe_mem_init_dma(struct rxe_pd *pd,
int access, struct rxe_mem *mem); int access, struct rxe_mem *mem);
int rxe_mem_init_user(struct rxe_dev *rxe, struct rxe_pd *pd, u64 start, int rxe_mem_init_user(struct rxe_pd *pd, u64 start,
u64 length, u64 iova, int access, struct ib_udata *udata, u64 length, u64 iova, int access, struct ib_udata *udata,
struct rxe_mem *mr); struct rxe_mem *mr);
int rxe_mem_init_fast(struct rxe_dev *rxe, struct rxe_pd *pd, int rxe_mem_init_fast(struct rxe_pd *pd,
int max_pages, struct rxe_mem *mem); int max_pages, struct rxe_mem *mem);
int rxe_mem_copy(struct rxe_mem *mem, u64 iova, void *addr, int rxe_mem_copy(struct rxe_mem *mem, u64 iova, void *addr,
int length, enum copy_direction dir, u32 *crcp); int length, enum copy_direction dir, u32 *crcp);
int copy_data(struct rxe_dev *rxe, struct rxe_pd *pd, int access, int copy_data(struct rxe_pd *pd, int access,
struct rxe_dma_info *dma, void *addr, int length, struct rxe_dma_info *dma, void *addr, int length,
enum copy_direction dir, u32 *crcp); enum copy_direction dir, u32 *crcp);

13
drivers/infiniband/sw/rxe/rxe_mr.c
View File

@ -107,7 +107,7 @@ void rxe_mem_cleanup(struct rxe_pool_entry *arg)
} }
} }
static int rxe_mem_alloc(struct rxe_dev *rxe, struct rxe_mem *mem, int num_buf) static int rxe_mem_alloc(struct rxe_mem *mem, int num_buf)
{ {
int i; int i;
int num_map; int num_map;
@ -145,7 +145,7 @@ static int rxe_mem_alloc(struct rxe_dev *rxe, struct rxe_mem *mem, int num_buf)
return -ENOMEM; return -ENOMEM;
} }
int rxe_mem_init_dma(struct rxe_dev *rxe, struct rxe_pd *pd, int rxe_mem_init_dma(struct rxe_pd *pd,
int access, struct rxe_mem *mem) int access, struct rxe_mem *mem)
{ {
rxe_mem_init(access, mem); rxe_mem_init(access, mem);
@ -158,7 +158,7 @@ int rxe_mem_init_dma(struct rxe_dev *rxe, struct rxe_pd *pd,
return 0; return 0;
} }
int rxe_mem_init_user(struct rxe_dev *rxe, struct rxe_pd *pd, u64 start, int rxe_mem_init_user(struct rxe_pd *pd, u64 start,
u64 length, u64 iova, int access, struct ib_udata *udata, u64 length, u64 iova, int access, struct ib_udata *udata,
struct rxe_mem *mem) struct rxe_mem *mem)
{ {
@ -184,7 +184,7 @@ int rxe_mem_init_user(struct rxe_dev *rxe, struct rxe_pd *pd, u64 start,
rxe_mem_init(access, mem); rxe_mem_init(access, mem);
err = rxe_mem_alloc(rxe, mem, num_buf); err = rxe_mem_alloc(mem, num_buf);
if (err) { if (err) {
pr_warn("err %d from rxe_mem_alloc\n", err); pr_warn("err %d from rxe_mem_alloc\n", err);
ib_umem_release(umem); ib_umem_release(umem);
@ -236,7 +236,7 @@ int rxe_mem_init_user(struct rxe_dev *rxe, struct rxe_pd *pd, u64 start,
return err; return err;
} }
int rxe_mem_init_fast(struct rxe_dev *rxe, struct rxe_pd *pd, int rxe_mem_init_fast(struct rxe_pd *pd,
int max_pages, struct rxe_mem *mem) int max_pages, struct rxe_mem *mem)
{ {
int err; int err;
@ -246,7 +246,7 @@ int rxe_mem_init_fast(struct rxe_dev *rxe, struct rxe_pd *pd,
/* In fastreg, we also set the rkey */ /* In fastreg, we also set the rkey */
mem->ibmr.rkey = mem->ibmr.lkey; mem->ibmr.rkey = mem->ibmr.lkey;
err = rxe_mem_alloc(rxe, mem, max_pages); err = rxe_mem_alloc(mem, max_pages);
if (err) if (err)
goto err1; goto err1;
@ -434,7 +434,6 @@ int rxe_mem_copy(struct rxe_mem *mem, u64 iova, void *addr, int length,
* under the control of a dma descriptor * under the control of a dma descriptor
*/ */
int copy_data( int copy_data(
struct rxe_dev *rxe,
struct rxe_pd *pd, struct rxe_pd *pd,
int access, int access,
struct rxe_dma_info *dma, struct rxe_dma_info *dma,

2
drivers/infiniband/sw/rxe/rxe_req.c
View File

@ -490,7 +490,7 @@ static int fill_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe,
wqe->dma.resid -= paylen; wqe->dma.resid -= paylen;
wqe->dma.sge_offset += paylen; wqe->dma.sge_offset += paylen;
} else { } else {
err = copy_data(rxe, qp->pd, 0, &wqe->dma, err = copy_data(qp->pd, 0, &wqe->dma,
payload_addr(pkt), paylen, payload_addr(pkt), paylen,
from_mem_obj, from_mem_obj,
&crc); &crc);

3
drivers/infiniband/sw/rxe/rxe_resp.c
View File

@ -511,9 +511,8 @@ static enum resp_states send_data_in(struct rxe_qp *qp, void *data_addr,
int data_len) int data_len)
{ {
int err; int err;
struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
err = copy_data(rxe, qp->pd, IB_ACCESS_LOCAL_WRITE, &qp->resp.wqe->dma, err = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE, &qp->resp.wqe->dma,
data_addr, data_len, to_mem_obj, NULL); data_addr, data_len, to_mem_obj, NULL);
if (unlikely(err)) if (unlikely(err))
return (err == -ENOSPC) ? RESPST_ERR_LENGTH return (err == -ENOSPC) ? RESPST_ERR_LENGTH

6
drivers/infiniband/sw/rxe/rxe_verbs.c
View File

@ -1011,7 +1011,7 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)
rxe_add_ref(pd); rxe_add_ref(pd);
err = rxe_mem_init_dma(rxe, pd, access, mr); err = rxe_mem_init_dma(pd, access, mr);
if (err) if (err)
goto err2; goto err2;
@ -1046,7 +1046,7 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,
rxe_add_ref(pd); rxe_add_ref(pd);
err = rxe_mem_init_user(rxe, pd, start, length, iova, err = rxe_mem_init_user(pd, start, length, iova,
access, udata, mr); access, udata, mr);
if (err) if (err)
goto err3; goto err3;
@ -1094,7 +1094,7 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd,
rxe_add_ref(pd); rxe_add_ref(pd);
err = rxe_mem_init_fast(rxe, pd, max_num_sg, mr); err = rxe_mem_init_fast(pd, max_num_sg, mr);
if (err) if (err)
goto err2; goto err2;