tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

RDMA/rxe: Return void from rxe_mem_init_dma()

The return value from rxe_mem_init_dma() is always 0 - change it to be
void and fix the callers accordingly.

Fixes: 8700e3e7c485 ("Soft RoCE driver")
Link: https://lore.kernel.org/r/20200705104313.283034-4-kamalheib1@gmail.com
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

authored by

Kamal Heib and committed by
Jason Gunthorpe 293d8440 9d576eac

+7 -23
+2 -2
drivers/infiniband/sw/rxe/rxe_loc.h
··· 103 103 from_mem_obj, 104 104 }; 105 105 106 - int rxe_mem_init_dma(struct rxe_pd *pd, 107 - int access, struct rxe_mem *mem); 106 + void rxe_mem_init_dma(struct rxe_pd *pd, 107 + int access, struct rxe_mem *mem); 108 108 109 109 int rxe_mem_init_user(struct rxe_pd *pd, u64 start, 110 110 u64 length, u64 iova, int access, struct ib_udata *udata,
+2 -4
drivers/infiniband/sw/rxe/rxe_mr.c
··· 144 144 return -ENOMEM; 145 145 } 146 146 147 - int rxe_mem_init_dma(struct rxe_pd *pd, 148 - int access, struct rxe_mem *mem) 147 + void rxe_mem_init_dma(struct rxe_pd *pd, 148 + int access, struct rxe_mem *mem) 149 149 { 150 150 rxe_mem_init(access, mem); 151 151 ··· 153 153 mem->access = access; 154 154 mem->state = RXE_MEM_STATE_VALID; 155 155 mem->type = RXE_MEM_TYPE_DMA; 156 - 157 - return 0; 158 156 } 159 157 160 158 int rxe_mem_init_user(struct rxe_pd *pd, u64 start,
+3 -17
drivers/infiniband/sw/rxe/rxe_verbs.c
··· 901 901 struct rxe_dev *rxe = to_rdev(ibpd->device); 902 902 struct rxe_pd *pd = to_rpd(ibpd); 903 903 struct rxe_mem *mr; 904 - int err; 905 904 906 905 mr = rxe_alloc(&rxe->mr_pool); 907 - if (!mr) { 908 - err = -ENOMEM; 909 - goto err1; 910 - } 906 + if (!mr) 907 + return ERR_PTR(-ENOMEM); 911 908 912 909 rxe_add_index(mr); 913 - 914 910 rxe_add_ref(pd); 915 - 916 - err = rxe_mem_init_dma(pd, access, mr); 917 - if (err) 918 - goto err2; 911 + rxe_mem_init_dma(pd, access, mr); 919 912 920 913 return &mr->ibmr; 921 - 922 - err2: 923 - rxe_drop_ref(pd); 924 - rxe_drop_index(mr); 925 - rxe_drop_ref(mr); 926 - err1: 927 - return ERR_PTR(err); 928 914 } 929 915 930 916 static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,