RDMA/cxgb3: Use sizeof() notation instead of plain sizeof

sizeof(a), sizeof a and sizeof (a) are all valid notations, but first is
more readable format recommended by checkpatch.pl.

Let's canonize it in cxgb3 drivers, so latter patches won't emit
checkpatch warnings. As part of this change, a redundant memset() was
removed.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 8ac72ac7cbac7f9a6dd72a31c190fcd5a5c2af72..e9a5f45dfa14f648e6556bdce633e6a689f80647 100644 (file)
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -219,7 +219,7 @@ static u32 get_qpid(struct cxio_rdev *rdev_p, struct cxio_ucontext *uctx)
                if (!qpid)
                        goto out;
                for (i = qpid+1; i & rdev_p->qpmask; i++) {
-                       entry = kmalloc(sizeof *entry, GFP_KERNEL);
+                       entry = kmalloc(sizeof(*entry), GFP_KERNEL);
                        if (!entry)
                                break;
                        entry->qpid = i;
@@ -237,7 +237,7 @@ static void put_qpid(struct cxio_rdev *rdev_p, u32 qpid,
 {
        struct cxio_qpid_list *entry;
 
-       entry = kmalloc(sizeof *entry, GFP_KERNEL);
+       entry = kmalloc(sizeof(*entry), GFP_KERNEL);
        if (!entry)
                return;
        pr_debug("%s qpid 0x%x\n", __func__, qpid);

diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 1c90c86fc8b83d2bd3a9c2fe75a8ff16beda1925..0bca72cb4d9a1b21041cb0ce11a513185a260d52 100644 (file)
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -170,7 +170,7 @@ static void release_tid(struct t3cdev *tdev, u32 hwtid, struct sk_buff *skb)
 {
        struct cpl_tid_release *req;
 
-       skb = get_skb(skb, sizeof *req, GFP_KERNEL);
+       skb = get_skb(skb, sizeof(*req), GFP_KERNEL);
        if (!skb)
                return;
        req = skb_put(skb, sizeof(*req));

diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 3a481dfb1607a2556d1afa1664b92d30dfd955de..82669c254b3f256ec382276da5835f4667db924d 100644 (file)
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -127,7 +127,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev,
 
        if (udata) {
                if (!t3a_device(rhp)) {
-                       if (ib_copy_from_udata(&ureq, udata, sizeof (ureq))) {
+                       if (ib_copy_from_udata(&ureq, udata, sizeof(ureq))) {
                                kfree(chp);
                                return ERR_PTR(-EFAULT);
                        }
@@ -172,7 +172,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev,
                struct iwch_ucontext *ucontext = rdma_udata_to_drv_context(
                        udata, struct iwch_ucontext, ibucontext);
 
-               mm = kmalloc(sizeof *mm, GFP_KERNEL);
+               mm = kmalloc(sizeof(*mm), GFP_KERNEL);
                if (!mm) {
                        iwch_destroy_cq(&chp->ibcq, udata);
                        return ERR_PTR(-ENOMEM);
@@ -185,7 +185,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev,
                spin_unlock(&ucontext->mmap_lock);
                mm->key = uresp.key;
                mm->addr = virt_to_phys(chp->cq.queue);
-               if (udata->outlen < sizeof uresp) {
+               if (udata->outlen < sizeof(uresp)) {
                        if (!warned++)
                                pr_warn("Warning - downlevel libcxgb3 (non-fatal)\n");
                        mm->len = PAGE_ALIGN((1UL << uresp.size_log2) *
@@ -196,7 +196,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev,
                                             sizeof(struct t3_cqe));
                        uresp.memsize = mm->len;
                        uresp.reserved = 0;
-                       resplen = sizeof uresp;
+                       resplen = sizeof(uresp);
                }
                if (ib_copy_to_udata(udata, &uresp, resplen)) {
                        kfree(mm);
@@ -553,7 +553,7 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
 
        for_each_sg_dma_page(mhp->umem->sg_head.sgl, &sg_iter, mhp->umem->nmap, 0) {
                pages[i++] = cpu_to_be64(sg_page_iter_dma_address(&sg_iter));
-               if (i == PAGE_SIZE / sizeof *pages) {
+               if (i == PAGE_SIZE / sizeof(*pages)) {
                        err = iwch_write_pbl(mhp, pages, i, n);
                        if (err)
                                goto pbl_done;
@@ -587,7 +587,7 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
                pr_debug("%s user resp pbl_addr 0x%x\n", __func__,
                         uresp.pbl_addr);
 
-               if (ib_copy_to_udata(udata, &uresp, sizeof (uresp))) {
+               if (ib_copy_to_udata(udata, &uresp, sizeof(uresp))) {
                        iwch_dereg_mr(&mhp->ibmr, udata);
                        err = -EFAULT;
                        goto err;
@@ -880,13 +880,13 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd,
 
                struct iwch_mm_entry *mm1, *mm2;
 
-               mm1 = kmalloc(sizeof *mm1, GFP_KERNEL);
+               mm1 = kmalloc(sizeof(*mm1), GFP_KERNEL);
                if (!mm1) {
                        iwch_destroy_qp(&qhp->ibqp, udata);
                        return ERR_PTR(-ENOMEM);
                }
 
-               mm2 = kmalloc(sizeof *mm2, GFP_KERNEL);
+               mm2 = kmalloc(sizeof(*mm2), GFP_KERNEL);
                if (!mm2) {
                        kfree(mm1);
                        iwch_destroy_qp(&qhp->ibqp, udata);
@@ -903,7 +903,7 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd,
                uresp.db_key = ucontext->key;
                ucontext->key += PAGE_SIZE;
                spin_unlock(&ucontext->mmap_lock);
-               if (ib_copy_to_udata(udata, &uresp, sizeof (uresp))) {
+               if (ib_copy_to_udata(udata, &uresp, sizeof(uresp))) {
                        kfree(mm1);
                        kfree(mm2);
                        iwch_destroy_qp(&qhp->ibqp, udata);
@@ -911,7 +911,7 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd,
                }
                mm1->key = uresp.key;
                mm1->addr = virt_to_phys(qhp->wq.queue);
-               mm1->len = PAGE_ALIGN(wqsize * sizeof (union t3_wr));
+               mm1->len = PAGE_ALIGN(wqsize * sizeof(union t3_wr));
                insert_mmap(ucontext, mm1);
                mm2->key = uresp.db_key;
                mm2->addr = qhp->wq.udb & PAGE_MASK;
@@ -932,7 +932,7 @@ static int iwch_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        struct iwch_dev *rhp;
        struct iwch_qp *qhp;
        enum iwch_qp_attr_mask mask = 0;
-       struct iwch_qp_attributes attrs;
+       struct iwch_qp_attributes attrs = {};
 
        pr_debug("%s ib_qp %p\n", __func__, ibqp);
 
@@ -944,7 +944,6 @@ static int iwch_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        if (!attr_mask)
                return 0;
 
-       memset(&attrs, 0, sizeof attrs);
        qhp = to_iwch_qp(ibqp);
        rhp = qhp->rhp;
 
@@ -1040,7 +1039,6 @@ static int iwch_query_device(struct ib_device *ibdev, struct ib_device_attr *pro
                return -EINVAL;
 
        dev = to_iwch_dev(ibdev);
-       memset(props, 0, sizeof *props);
        memcpy(&props->sys_image_guid, dev->rdev.t3cdev_p->lldev->dev_addr, 6);
        props->hw_ver = dev->rdev.t3cdev_p->type;
        props->fw_ver = fw_vers_string_to_u64(dev);