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

RDMA/hns: Fix non-standard error codes

It is better to return a linux error code than define a private constant.

Link: https://lore.kernel.org/r/1572952082-6681-9-git-send-email-liweihang@hisilicon.com
Signed-off-by: Yixian Liu <liuyixian@huawei.com>
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@hisilicon.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

authored by

Yixian Liu and committed by
Jason Gunthorpe
1ceb0b11 301cc7eb

+14 -13
+2 -2
drivers/infiniband/hw/hns/hns_roce_alloc.c
··· 55 55 bitmap->last = 0; 56 56 *obj |= bitmap->top; 57 57 } else { 58 - ret = -1; 58 + ret = -EINVAL; 59 59 } 60 60 61 61 spin_unlock(&bitmap->lock); ··· 100 100 } 101 101 *obj |= bitmap->top; 102 102 } else { 103 - ret = -1; 103 + ret = -EINVAL; 104 104 } 105 105 106 106 spin_unlock(&bitmap->lock);
+2 -2
drivers/infiniband/hw/hns/hns_roce_cq.c
··· 116 116 hr_cq->vector = vector; 117 117 118 118 ret = hns_roce_bitmap_alloc(&cq_table->bitmap, &hr_cq->cqn); 119 - if (ret == -1) { 119 + if (ret) { 120 120 dev_err(dev, "CQ alloc.Failed to alloc index.\n"); 121 - return -ENOMEM; 121 + return ret; 122 122 } 123 123 124 124 /* Get CQC memory HEM(Hardware Entry Memory) table */
+8 -7
drivers/infiniband/hw/hns/hns_roce_mr.c
··· 83 83 } 84 84 } 85 85 spin_unlock(&buddy->lock); 86 - return -1; 86 + return -EINVAL; 87 87 88 88 found: 89 89 clear_bit(*seg, buddy->bits[o]); ··· 206 206 } 207 207 208 208 ret = hns_roce_buddy_alloc(buddy, order, seg); 209 - if (ret == -1) 210 - return -1; 209 + if (ret) 210 + return ret; 211 211 212 - if (hns_roce_table_get_range(hr_dev, table, *seg, 213 - *seg + (1 << order) - 1)) { 212 + ret = hns_roce_table_get_range(hr_dev, table, *seg, 213 + *seg + (1 << order) - 1); 214 + if (ret) { 214 215 hns_roce_buddy_free(buddy, *seg, order); 215 - return -1; 216 + return ret; 216 217 } 217 218 218 219 return 0; ··· 579 578 580 579 /* Allocate a key for mr from mr_table */ 581 580 ret = hns_roce_bitmap_alloc(&hr_dev->mr_table.mtpt_bitmap, &index); 582 - if (ret == -1) 581 + if (ret) 583 582 return -ENOMEM; 584 583 585 584 mr->iova = iova; /* MR va starting addr */
+1 -1
drivers/infiniband/hw/hns/hns_roce_pd.c
··· 96 96 97 97 /* Using bitmap to manager UAR index */ 98 98 ret = hns_roce_bitmap_alloc(&hr_dev->uar_table.bitmap, &uar->logic_idx); 99 - if (ret == -1) 99 + if (ret) 100 100 return -ENOMEM; 101 101 102 102 if (uar->logic_idx > 0 && hr_dev->caps.phy_num_uars > 1)
+1 -1
drivers/infiniband/hw/hns/hns_roce_srq.c
··· 111 111 } 112 112 113 113 ret = hns_roce_bitmap_alloc(&srq_table->bitmap, &srq->srqn); 114 - if (ret == -1) { 114 + if (ret) { 115 115 dev_err(hr_dev->dev, "SRQ alloc.Failed to alloc index.\n"); 116 116 return -ENOMEM; 117 117 }