Commit 34d56893 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/cxgb4: Use sizeof() notation 



Convert various sizeof call sites to be written in standard format
sizeof().

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a80287c8

drivers/infiniband/hw/cxgb4/cm.c

+12 −9
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ static int send_mpa_req(struct c4iw_ep *ep, struct sk_buff *skb, 
	mpalen = sizeof(*mpa) + ep->plen;

	if (mpa_rev_to_use == 2)

		mpalen += sizeof(struct mpa_v2_conn_params);

	wrlen = roundup(mpalen + sizeof *req, 16);

	wrlen = roundup(mpalen + sizeof(*req), 16);

	skb = get_skb(skb, wrlen, GFP_KERNEL);

	if (!skb) {

		connect_reply_upcall(ep, -ENOMEM);
@@ -997,7 +997,8 @@ static int send_mpa_req(struct c4iw_ep *ep, struct sk_buff *skb, 
	}



	if (mpa_rev_to_use == 2) {

		mpa->private_data_size = htons(ntohs(mpa->private_data_size) +

		mpa->private_data_size =

			htons(ntohs(mpa->private_data_size) +

			      sizeof(struct mpa_v2_conn_params));

		pr_debug("initiator ird %u ord %u\n", ep->ird,

			 ep->ord);
@@ -1057,7 +1058,7 @@ static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen) 
	mpalen = sizeof(*mpa) + plen;

	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn)

		mpalen += sizeof(struct mpa_v2_conn_params);

	wrlen = roundup(mpalen + sizeof *req, 16);

	wrlen = roundup(mpalen + sizeof(*req), 16);



	skb = get_skb(NULL, wrlen, GFP_KERNEL);

	if (!skb) {
@@ -1088,7 +1089,8 @@ static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen) 


	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {

		mpa->flags |= MPA_ENHANCED_RDMA_CONN;

		mpa->private_data_size = htons(ntohs(mpa->private_data_size) +

		mpa->private_data_size =

			htons(ntohs(mpa->private_data_size) +

			      sizeof(struct mpa_v2_conn_params));

		mpa_v2_params.ird = htons(((u16)ep->ird) |

					  (peer2peer ? MPA_V2_PEER2PEER_MODEL :
@@ -1136,7 +1138,7 @@ static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen) 
	mpalen = sizeof(*mpa) + plen;

	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn)

		mpalen += sizeof(struct mpa_v2_conn_params);

	wrlen = roundup(mpalen + sizeof *req, 16);

	wrlen = roundup(mpalen + sizeof(*req), 16);



	skb = get_skb(NULL, wrlen, GFP_KERNEL);

	if (!skb) {
@@ -1171,7 +1173,8 @@ static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen) 


	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {

		mpa->flags |= MPA_ENHANCED_RDMA_CONN;

		mpa->private_data_size = htons(ntohs(mpa->private_data_size) +

		mpa->private_data_size =

			htons(ntohs(mpa->private_data_size) +

			      sizeof(struct mpa_v2_conn_params));

		mpa_v2_params.ird = htons((u16)ep->ird);

		mpa_v2_params.ord = htons((u16)ep->ord);

drivers/infiniband/hw/cxgb4/cq.c

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, 
	int wr_len;

	int ret;



	wr_len = sizeof *res_wr + sizeof *res;

	wr_len = sizeof(*res_wr) + sizeof(*res);

	set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);



	res_wr = __skb_put_zero(skb, wr_len);
@@ -117,7 +117,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, 
	}



	/* build fw_ri_res_wr */

	wr_len = sizeof *res_wr + sizeof *res;

	wr_len = sizeof(*res_wr) + sizeof(*res);



	skb = alloc_skb(wr_len, GFP_KERNEL);

	if (!skb) {
@@ -1095,10 +1095,10 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, 


	if (ucontext) {

		ret = -ENOMEM;

		mm = kmalloc(sizeof *mm, GFP_KERNEL);

		mm = kmalloc(sizeof(*mm), GFP_KERNEL);

		if (!mm)

			goto err_remove_handle;

		mm2 = kmalloc(sizeof *mm2, GFP_KERNEL);

		mm2 = kmalloc(sizeof(*mm2), GFP_KERNEL);

		if (!mm2)

			goto err_free_mm;

drivers/infiniband/hw/cxgb4/device.c

+4 −5
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static int qp_open(struct inode *inode, struct file *file) 
	unsigned long index;

	int count = 1;



	qpd = kmalloc(sizeof *qpd, GFP_KERNEL);

	qpd = kmalloc(sizeof(*qpd), GFP_KERNEL);

	if (!qpd)

		return -ENOMEM;
@@ -421,7 +421,7 @@ static int stag_open(struct inode *inode, struct file *file) 
	int ret = 0;

	int count = 1;



	stagd = kmalloc(sizeof *stagd, GFP_KERNEL);

	stagd = kmalloc(sizeof(*stagd), GFP_KERNEL);

	if (!stagd) {

		ret = -ENOMEM;

		goto out;
@@ -1075,7 +1075,7 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop) 
		pr_info("Chelsio T4/T5 RDMA Driver - version %s\n",

			DRV_VERSION);



	ctx = kzalloc(sizeof *ctx, GFP_KERNEL);

	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);

	if (!ctx) {

		ctx = ERR_PTR(-ENOMEM);

		goto out;
@@ -1243,10 +1243,9 @@ static int c4iw_uld_state_change(void *handle, enum cxgb4_state new_state) 
	case CXGB4_STATE_START_RECOVERY:

		pr_info("%s: Fatal Error\n", pci_name(ctx->lldi.pdev));

		if (ctx->dev) {

			struct ib_event event;

			struct ib_event event = {};



			ctx->dev->rdev.flags |= T4_FATAL_ERROR;

			memset(&event, 0, sizeof event);

			event.event  = IB_EVENT_DEVICE_FATAL;

			event.device = &ctx->dev->ibdev;

			ib_dispatch_event(&event);

drivers/infiniband/hw/cxgb4/mem.c

+3 −2
Original line number Diff line number Diff line
@@ -130,8 +130,9 @@ static int _c4iw_write_mem_inline(struct c4iw_rdev *rdev, u32 addr, u32 len, 


		copy_len = len > C4IW_MAX_INLINE_SIZE ? C4IW_MAX_INLINE_SIZE :

			   len;

		wr_len = roundup(sizeof *req + sizeof *sc +

				 roundup(copy_len, T4_ULPTX_MIN_IO), 16);

		wr_len = roundup(sizeof(*req) + sizeof(*sc) +

					 roundup(copy_len, T4_ULPTX_MIN_IO),

				 16);



		if (!skb) {

			skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);

drivers/infiniband/hw/cxgb4/provider.c

+0 −1
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ static int c4iw_query_device(struct ib_device *ibdev, struct ib_device_attr *pro 
		return -EINVAL;



	dev = to_c4iw_dev(ibdev);

	memset(props, 0, sizeof *props);

	memcpy(&props->sys_image_guid, dev->rdev.lldi.ports[0]->dev_addr, 6);

	props->hw_ver = CHELSIO_CHIP_RELEASE(dev->rdev.lldi.adapter_type);

	props->fw_ver = dev->rdev.lldi.fw_vers;

CRA Git | Maintained and supported by SUSTech CRA and CCSE