Commit dc78074a authored by Bob Pearson's avatar Bob Pearson Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Fix minor coding style issues 

checkpatch -f found 3 warnings in RDMA/rxe

1. a missing space following switch
2. return followed by else
3. use of strlcpy() instead of strscpy().

This patch fixes each of these. In

		...
	} elseif (...) {
		...
		return 0;
	} else
		...

The middle block can be safely moved since it is completely independent of
the other code.

Link: https://lore.kernel.org/r/20210205230525.49068-1-rpearson@hpe.com


Signed-off-by: default avatarBob Pearson <rpearson@hpe.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent db72438c

drivers/infiniband/sw/rxe/rxe_verbs.c

+10 −6
Original line number Diff line number Diff line
@@ -566,6 +566,13 @@ static int init_send_wqe(struct rxe_qp *qp, const struct ib_send_wr *ibwr, 


	init_send_wr(qp, &wqe->wr, ibwr);



	/* local operation */

	if (unlikely(mask & WR_REG_MASK)) {

		wqe->mask = mask;

		wqe->state = wqe_state_posted;

		return 0;

	}



	if (qp_type(qp) == IB_QPT_UD ||

	    qp_type(qp) == IB_QPT_SMI ||

	    qp_type(qp) == IB_QPT_GSI)
@@ -581,13 +588,10 @@ static int init_send_wqe(struct rxe_qp *qp, const struct ib_send_wr *ibwr, 


			p += sge->length;

		}

	} else if (mask & WR_REG_MASK) {

		wqe->mask = mask;

		wqe->state = wqe_state_posted;

		return 0;

	} else

	} else {

		memcpy(wqe->dma.sge, ibwr->sg_list,

		       num_sge * sizeof(struct ib_sge));

	}



	wqe->iova = mask & WR_ATOMIC_MASK ? atomic_wr(ibwr)->remote_addr :

		mask & WR_READ_OR_WRITE_MASK ? rdma_wr(ibwr)->remote_addr : 0;
@@ -1118,7 +1122,7 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name) 
	struct ib_device *dev = &rxe->ib_dev;

	struct crypto_shash *tfm;



	strlcpy(dev->node_desc, "rxe", sizeof(dev->node_desc));

	strscpy(dev->node_desc, "rxe", sizeof(dev->node_desc));



	dev->node_type = RDMA_NODE_IB_CA;

	dev->phys_port_cnt = 1;

drivers/infiniband/sw/rxe/rxe_qp.c

+1 −1

File changed.

Contains only whitespace changes.