Commit 1ceb0b11 authored by Yixian Liu's avatar Yixian Liu Committed by Jason Gunthorpe
Browse files

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: default avatarYixian Liu <liuyixian@huawei.com>
Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@hisilicon.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 301cc7eb

drivers/infiniband/hw/hns/hns_roce_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int hns_roce_bitmap_alloc(struct hns_roce_bitmap *bitmap, unsigned long *obj) 
			bitmap->last = 0;

		*obj |= bitmap->top;

	} else {

		ret = -1;

		ret = -EINVAL;

	}



	spin_unlock(&bitmap->lock);
@@ -100,7 +100,7 @@ int hns_roce_bitmap_alloc_range(struct hns_roce_bitmap *bitmap, int cnt, 
		}

		*obj |= bitmap->top;

	} else {

		ret = -1;

		ret = -EINVAL;

	}



	spin_unlock(&bitmap->lock);

drivers/infiniband/hw/hns/hns_roce_cq.c

+2 −2
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ static int hns_roce_cq_alloc(struct hns_roce_dev *hr_dev, int nent, 
	hr_cq->vector = vector;



	ret = hns_roce_bitmap_alloc(&cq_table->bitmap, &hr_cq->cqn);

	if (ret == -1) {

	if (ret) {

		dev_err(dev, "CQ alloc.Failed to alloc index.\n");

		return -ENOMEM;

		return ret;

	}



	/* Get CQC memory HEM(Hardware Entry Memory) table */

drivers/infiniband/hw/hns/hns_roce_mr.c

+8 −7
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int hns_roce_buddy_alloc(struct hns_roce_buddy *buddy, int order, 
		}

	}

	spin_unlock(&buddy->lock);

	return -1;

	return -EINVAL;



 found:

	clear_bit(*seg, buddy->bits[o]);
@@ -206,13 +206,14 @@ static int hns_roce_alloc_mtt_range(struct hns_roce_dev *hr_dev, int order, 
	}



	ret = hns_roce_buddy_alloc(buddy, order, seg);

	if (ret == -1)

		return -1;

	if (ret)

		return ret;



	if (hns_roce_table_get_range(hr_dev, table, *seg,

				     *seg + (1 << order) - 1)) {

	ret = hns_roce_table_get_range(hr_dev, table, *seg,

				       *seg + (1 << order) - 1);

	if (ret) {

		hns_roce_buddy_free(buddy, *seg, order);

		return -1;

		return ret;

	}



	return 0;
@@ -578,7 +579,7 @@ static int hns_roce_mr_alloc(struct hns_roce_dev *hr_dev, u32 pd, u64 iova, 


	/* Allocate a key for mr from mr_table */

	ret = hns_roce_bitmap_alloc(&hr_dev->mr_table.mtpt_bitmap, &index);

	if (ret == -1)

	if (ret)

		return -ENOMEM;



	mr->iova = iova;			/* MR va starting addr */

drivers/infiniband/hw/hns/hns_roce_pd.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int hns_roce_uar_alloc(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar) 


	/* Using bitmap to manager UAR index */

	ret = hns_roce_bitmap_alloc(&hr_dev->uar_table.bitmap, &uar->logic_idx);

	if (ret == -1)

	if (ret)

		return -ENOMEM;



	if (uar->logic_idx > 0 && hr_dev->caps.phy_num_uars > 1)

drivers/infiniband/hw/hns/hns_roce_srq.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int hns_roce_srq_alloc(struct hns_roce_dev *hr_dev, u32 pdn, u32 cqn, 
	}



	ret = hns_roce_bitmap_alloc(&srq_table->bitmap, &srq->srqn);

	if (ret == -1) {

	if (ret) {

		dev_err(hr_dev->dev, "SRQ alloc.Failed to alloc index.\n");

		return -ENOMEM;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE