[PATCH] Transform kmem_cache_alloc()+memset(0) -> kmem_cache_zalloc().

Replace appropriate pairs of "kmem_cache_alloc()" + "memset(0)" with the
corresponding "kmem_cache_zalloc()" call.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Roland McGrath <roland@redhat.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Acked-by: Joel Becker <Joel.Becker@oracle.com>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Jan Kara <jack@ucw.cz>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 5 insertions, 10 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index 9291a86ca053..6ebfa27e4e16 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -134,14 +134,13 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe,
         if (cqe >= 0xFFFFFFFF - 64 - additional_cqe)
                 return ERR_PTR(-EINVAL);
 
-        my_cq = kmem_cache_alloc(cq_cache, GFP_KERNEL);
+        my_cq = kmem_cache_zalloc(cq_cache, GFP_KERNEL);
         if (!my_cq) {
                 ehca_err(device, "Out of memory for ehca_cq struct device=%p",
                          device);
                 return ERR_PTR(-ENOMEM);
         }
 
-        memset(my_cq, 0, sizeof(struct ehca_cq));
         memset(&param, 0, sizeof(struct ehca_alloc_cq_parms));
 
         spin_lock_init(&my_cq->spinlock);
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index cfb362a1029c..d22ab563633f 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -53,9 +53,8 @@ static struct ehca_mr *ehca_mr_new(void)
 {
         struct ehca_mr *me;
 
-        me = kmem_cache_alloc(mr_cache, GFP_KERNEL);
+        me = kmem_cache_zalloc(mr_cache, GFP_KERNEL);
         if (me) {
-                memset(me, 0, sizeof(struct ehca_mr));
                 spin_lock_init(&me->mrlock);
         } else
                 ehca_gen_err("alloc failed");
@@ -72,9 +71,8 @@ static struct ehca_mw *ehca_mw_new(void)
 {
         struct ehca_mw *me;
 
-        me = kmem_cache_alloc(mw_cache, GFP_KERNEL);
+        me = kmem_cache_zalloc(mw_cache, GFP_KERNEL);
         if (me) {
-                memset(me, 0, sizeof(struct ehca_mw));
                 spin_lock_init(&me->mwlock);
         } else
                 ehca_gen_err("alloc failed");
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c
index d5345e5b3cd6..79d0591a8043 100644
--- a/drivers/infiniband/hw/ehca/ehca_pd.c
+++ b/drivers/infiniband/hw/ehca/ehca_pd.c
@@ -50,14 +50,13 @@ struct ib_pd *ehca_alloc_pd(struct ib_device *device,
 {
         struct ehca_pd *pd;
 
-        pd = kmem_cache_alloc(pd_cache, GFP_KERNEL);
+        pd = kmem_cache_zalloc(pd_cache, GFP_KERNEL);
         if (!pd) {
                 ehca_err(device, "device=%p context=%p out of memory",
                          device, context);
                 return ERR_PTR(-ENOMEM);
         }
 
-        memset(pd, 0, sizeof(struct ehca_pd));
         pd->ownpid = current->tgid;
 
         /*
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 95efef921f1d..df0516f24379 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -450,13 +450,12 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
         if (pd->uobject && udata)
                 context = pd->uobject->context;
 
-        my_qp = kmem_cache_alloc(qp_cache, GFP_KERNEL);
+        my_qp = kmem_cache_zalloc(qp_cache, GFP_KERNEL);
         if (!my_qp) {
                 ehca_err(pd->device, "pd=%p not enough memory to alloc qp", pd);
                 return ERR_PTR(-ENOMEM);
         }
 
-        memset(my_qp, 0, sizeof(struct ehca_qp));
         memset (&parms, 0, sizeof(struct ehca_alloc_qp_parms));
         spin_lock_init(&my_qp->spinlock_s);
         spin_lock_init(&my_qp->spinlock_r);