Commit dc93a0d9 authored by Lang Cheng's avatar Lang Cheng Committed by Jason Gunthorpe
Browse files

RDMA/hns: Fix coding style issues 

Just format the code without modifying anything, including fixing some
redundant and missing blanks and spaces and changing the variable
definition order.

Link: https://lore.kernel.org/r/1607650657-35992-8-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarLang Cheng <chenglang@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 29b52027

drivers/infiniband/hw/hns/hns_roce_cmd.c

+13 −14
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param, 
void hns_roce_cmd_event(struct hns_roce_dev *hr_dev, u16 token, u8 status,

			u64 out_param)

{

	struct hns_roce_cmd_context

		*context = &hr_dev->cmd.context[token & hr_dev->cmd.token_mask];

	struct hns_roce_cmd_context *context =

		&hr_dev->cmd.context[token % hr_dev->cmd.max_cmds];



	if (token != context->token)

		return;
@@ -164,8 +164,8 @@ static int hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, 
	int ret;



	down(&hr_dev->cmd.event_sem);

	ret = __hns_roce_cmd_mbox_wait(hr_dev, in_param, out_param,

				       in_modifier, op_modifier, op, timeout);

	ret = __hns_roce_cmd_mbox_wait(hr_dev, in_param, out_param, in_modifier,

				       op_modifier, op, timeout);

	up(&hr_dev->cmd.event_sem);



	return ret;
@@ -231,9 +231,8 @@ int hns_roce_cmd_use_events(struct hns_roce_dev *hr_dev) 
	struct hns_roce_cmdq *hr_cmd = &hr_dev->cmd;

	int i;



	hr_cmd->context = kmalloc_array(hr_cmd->max_cmds,

					sizeof(*hr_cmd->context),

					GFP_KERNEL);

	hr_cmd->context =

		kcalloc(hr_cmd->max_cmds, sizeof(*hr_cmd->context), GFP_KERNEL);

	if (!hr_cmd->context)

		return -ENOMEM;
@@ -262,8 +261,8 @@ void hns_roce_cmd_use_polling(struct hns_roce_dev *hr_dev) 
	hr_cmd->use_events = 0;

}



struct hns_roce_cmd_mailbox

	*hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev)

struct hns_roce_cmd_mailbox *

hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev)

{

	struct hns_roce_cmd_mailbox *mailbox;
@@ -271,8 +270,8 @@ struct hns_roce_cmd_mailbox 
	if (!mailbox)

		return ERR_PTR(-ENOMEM);



	mailbox->buf = dma_pool_alloc(hr_dev->cmd.pool, GFP_KERNEL,

				      &mailbox->dma);

	mailbox->buf =

		dma_pool_alloc(hr_dev->cmd.pool, GFP_KERNEL, &mailbox->dma);

	if (!mailbox->buf) {

		kfree(mailbox);

		return ERR_PTR(-ENOMEM);

drivers/infiniband/hw/hns/hns_roce_cmd.h

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ int hns_roce_cmd_mbox(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, 
		      unsigned long in_modifier, u8 op_modifier, u16 op,

		      unsigned long timeout);



struct hns_roce_cmd_mailbox

	*hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev);

struct hns_roce_cmd_mailbox *

hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev);

void hns_roce_free_cmd_mailbox(struct hns_roce_dev *hr_dev,

			       struct hns_roce_cmd_mailbox *mailbox);

drivers/infiniband/hw/hns/hns_roce_cq.c

+1 −1
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ 


static int alloc_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq)

{

	struct ib_device *ibdev = &hr_dev->ib_dev;

	struct hns_roce_cmd_mailbox *mailbox;

	struct hns_roce_cq_table *cq_table;

	struct ib_device *ibdev = &hr_dev->ib_dev;

	u64 mtts[MTT_MIN_COUNT] = { 0 };

	dma_addr_t dma_handle;

	int ret;

drivers/infiniband/hw/hns/hns_roce_hem.c

+10 −10
Original line number Diff line number Diff line
@@ -209,9 +209,9 @@ int hns_roce_calc_hem_mhop(struct hns_roce_dev *hr_dev, 
{

	struct device *dev = hr_dev->dev;

	u32 chunk_ba_num;

	u32 chunk_size;

	u32 table_idx;

	u32 bt_num;

	u32 chunk_size;



	if (get_hem_table_config(hr_dev, mhop, table->type))

		return -EINVAL;
@@ -343,15 +343,15 @@ static int hns_roce_set_hem(struct hns_roce_dev *hr_dev, 
{

	spinlock_t *lock = &hr_dev->bt_cmd_lock;

	struct device *dev = hr_dev->dev;

	long end;

	unsigned long flags;

	struct hns_roce_hem_iter iter;

	void __iomem *bt_cmd;

	__le32 bt_cmd_val[2];

	__le32 bt_cmd_h = 0;

	unsigned long flags;

	__le32 bt_cmd_l;

	u64 bt_ba;

	int ret = 0;

	u64 bt_ba;

	long end;



	/* Find the HEM(Hardware Entry Memory) entry */

	unsigned long i = (obj & (table->num_obj - 1)) /
@@ -651,8 +651,8 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev, 
		       struct hns_roce_hem_table *table, unsigned long obj)

{

	struct device *dev = hr_dev->dev;

	int ret = 0;

	unsigned long i;

	int ret = 0;



	if (hns_roce_check_whether_mhop(hr_dev, table->type))

		return hns_roce_table_mhop_get(hr_dev, table, obj);
@@ -800,14 +800,14 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev, 
	struct hns_roce_hem_chunk *chunk;

	struct hns_roce_hem_mhop mhop;

	struct hns_roce_hem *hem;

	void *addr = NULL;

	unsigned long mhop_obj = obj;

	unsigned long obj_per_chunk;

	unsigned long idx_offset;

	int offset, dma_offset;

	void *addr = NULL;

	u32 hem_idx = 0;

	int length;

	int i, j;

	u32 hem_idx = 0;



	if (!table->lowmem)

		return NULL;
@@ -977,8 +977,8 @@ static void hns_roce_cleanup_mhop_hem_table(struct hns_roce_dev *hr_dev, 
{

	struct hns_roce_hem_mhop mhop;

	u32 buf_chunk_size;

	int i;

	u64 obj;

	int i;



	if (hns_roce_calc_hem_mhop(hr_dev, table, NULL, &mhop))

		return;
@@ -1313,8 +1313,8 @@ static int hem_list_alloc_root_bt(struct hns_roce_dev *hr_dev, 
				  const struct hns_roce_buf_region *regions,

				  int region_cnt)

{

	struct roce_hem_item *hem, *temp_hem, *root_hem;

	struct list_head temp_list[HNS_ROCE_MAX_BT_REGION];

	struct roce_hem_item *hem, *temp_hem, *root_hem;

	const struct hns_roce_buf_region *r;

	struct list_head temp_root;

	struct list_head temp_btm;
@@ -1419,8 +1419,8 @@ int hns_roce_hem_list_request(struct hns_roce_dev *hr_dev, 
{

	const struct hns_roce_buf_region *r;

	int ofs, end;

	int ret;

	int unit;

	int ret;

	int i;



	if (region_cnt > HNS_ROCE_MAX_BT_REGION) {

drivers/infiniband/hw/hns/hns_roce_hw_v1.c

+3 −6
Original line number Diff line number Diff line
@@ -2760,7 +2760,6 @@ static int hns_roce_v1_m_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr, 
		roce_set_field(context->qpc_bytes_16,

			       QP_CONTEXT_QPC_BYTES_16_QP_NUM_M,

			       QP_CONTEXT_QPC_BYTES_16_QP_NUM_S, hr_qp->qpn);



	} else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_INIT) {

		roce_set_field(context->qpc_bytes_4,

			       QP_CONTEXT_QPC_BYTES_4_TRANSPORT_SERVICE_TYPE_M,
@@ -3795,7 +3794,6 @@ static int hns_roce_v1_aeq_int(struct hns_roce_dev *hr_dev, 
	int event_type;



	while ((aeqe = next_aeqe_sw_v1(eq))) {



		/* Make sure we read the AEQ entry after we have checked the

		 * ownership bit

		 */
@@ -3900,7 +3898,6 @@ static int hns_roce_v1_ceq_int(struct hns_roce_dev *hr_dev, 
	u32 cqn;



	while ((ceqe = next_ceqe_sw_v1(eq))) {



		/* Make sure we read CEQ entry after we have checked the

		 * ownership bit

		 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE