[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>

8 files changed, 9 insertions, 19 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);
diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c
index da94e126ca83..0cd7eed9196c 100644
--- a/drivers/scsi/aic94xx/aic94xx_hwi.c
+++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
@@ -1052,10 +1052,9 @@ static inline struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha,
         struct asd_ascb *ascb;
         unsigned long flags;
 
-        ascb = kmem_cache_alloc(asd_ascb_cache, gfp_flags);
+        ascb = kmem_cache_zalloc(asd_ascb_cache, gfp_flags);
 
         if (ascb) {
-                memset(ascb, 0, sizeof(*ascb));
                 ascb->dma_scb.size = sizeof(struct scb);
                 ascb->dma_scb.vaddr = dma_pool_alloc(asd_ha->scb_pool,
                                                      gfp_flags,
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index f02f48a882a9..a1cd6e6a292a 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -388,10 +388,9 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
         int err = 0;
         int write = (data_direction == DMA_TO_DEVICE);
 
-        sioc = kmem_cache_alloc(scsi_io_context_cache, gfp);
+        sioc = kmem_cache_zalloc(scsi_io_context_cache, gfp);
         if (!sioc)
                 return DRIVER_ERROR << 24;
-        memset(sioc, 0, sizeof(*sioc));
 
         req = blk_get_request(sdev->request_queue, write, gfp);
         if (!req)
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c
index 282d82efc0b0..f0ffb8907f29 100644
--- a/drivers/usb/host/hc_crisv10.c
+++ b/drivers/usb/host/hc_crisv10.c
@@ -2163,9 +2163,8 @@ static void etrax_usb_add_to_bulk_sb_list(struct urb *urb, int epid)
 
         maxlen = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe));
 
-        sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, SLAB_FLAG);
+        sb_desc = kmem_cache_zalloc(usb_desc_cache, SLAB_FLAG);
         assert(sb_desc != NULL);
-        memset(sb_desc, 0, sizeof(USB_SB_Desc_t));
 
 
         if (usb_pipeout(urb->pipe)) {
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index 2cbb239e63f8..68e66b33e726 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -624,12 +624,10 @@ static inline struct urb_priv *uhci_alloc_urb_priv(struct uhci_hcd *uhci,
 {
         struct urb_priv *urbp;
 
-        urbp = kmem_cache_alloc(uhci_up_cachep, GFP_ATOMIC);
+        urbp = kmem_cache_zalloc(uhci_up_cachep, GFP_ATOMIC);
         if (!urbp)
                 return NULL;
 
-        memset((void *)urbp, 0, sizeof(*urbp));
-
         urbp->urb = urb;
         urb->hcpriv = urbp;