[SCSI] aacraid: kmalloc/memset->kzalloc

Inspired somewhat by Vignesh Babu <vignesh.babu@wipro.com> patch to
dpt_i2o.c to replace kmalloc/memset sequences with kzalloc, doing the
same for the aacraid driver.

Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

3 files changed, 5 insertions, 10 deletions

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 33682ce96a5d..3009ad8c4073 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -387,12 +387,11 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
          *      Ok now init the communication subsystem
          */
 
-        dev->queues = kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
+        dev->queues = kzalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
         if (dev->queues == NULL) {
                 printk(KERN_ERR "Error could not allocate comm region.\n");
                 return NULL;
         }
-        memset(dev->queues, 0, sizeof(struct aac_queue_block));
 
         if (aac_comm_init(dev)<0){
                 kfree(dev->queues);
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 5824a757a753..9aca57eda943 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1223,13 +1223,11 @@ int aac_check_health(struct aac_dev * aac)
                  * Warning: no sleep allowed while
                  * holding spinlock
                  */
-                hw_fib = kmalloc(sizeof(struct hw_fib), GFP_ATOMIC);
-                fib = kmalloc(sizeof(struct fib), GFP_ATOMIC);
+                hw_fib = kzalloc(sizeof(struct hw_fib), GFP_ATOMIC);
+                fib = kzalloc(sizeof(struct fib), GFP_ATOMIC);
                 if (fib && hw_fib) {
                         struct aac_aifcmd * aif;
 
-                        memset(hw_fib, 0, sizeof(struct hw_fib));
-                        memset(fib, 0, sizeof(struct fib));
                         fib->hw_fib_va = hw_fib;
                         fib->dev = aac;
                         aac_fib_init(fib);
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index 42c7dcda6d9b..fcd25f7d0bc6 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -248,16 +248,14 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
                  * manage the linked lists.
                  */
                 if ((!dev->aif_thread)
-                 || (!(fib = kmalloc(sizeof(struct fib),GFP_ATOMIC))))
+                 || (!(fib = kzalloc(sizeof(struct fib),GFP_ATOMIC))))
                         return 1;
-                if (!(hw_fib = kmalloc(sizeof(struct hw_fib),GFP_ATOMIC))) {
+                if (!(hw_fib = kzalloc(sizeof(struct hw_fib),GFP_ATOMIC))) {
                         kfree (fib);
                         return 1;
                 }
-                memset(hw_fib, 0, sizeof(struct hw_fib));
                 memcpy(hw_fib, (struct hw_fib *)(((ptrdiff_t)(dev->regs.sa)) +
                   (index & ~0x00000002L)), sizeof(struct hw_fib));
-                memset(fib, 0, sizeof(struct fib));
                 INIT_LIST_HEAD(&fib->fiblink);
                 fib->type = FSAFS_NTC_FIB_CONTEXT;
                 fib->size = sizeof(struct fib);