18 files changed, 21 insertions, 45 deletions

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 76c09097175f..6b49f6a2524d 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1160,13 +1160,12 @@ static int twa_initialize_device_extension(TW_Device_Extension *tw_dev)
         }
 
         /* Allocate event info space */
-        tw_dev->event_queue[0] = kmalloc(sizeof(TW_Event) * TW_Q_LENGTH, GFP_KERNEL);
+        tw_dev->event_queue[0] = kcalloc(TW_Q_LENGTH, sizeof(TW_Event), GFP_KERNEL);
         if (!tw_dev->event_queue[0]) {
                 TW_PRINTK(tw_dev->host, TW_DRIVER, 0x18, "Event info memory allocation failed");
                 goto out;
         }
 
-        memset(tw_dev->event_queue[0], 0, sizeof(TW_Event) * TW_Q_LENGTH);
 
         for (i = 0; i < TW_Q_LENGTH; i++) {
                 tw_dev->event_queue[i] = (TW_Event *)((unsigned char *)tw_dev->event_queue[0] + (i * sizeof(TW_Event)));
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 8b5334c56f0a..773d11dd9953 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -3606,11 +3606,10 @@ out:
 int esp_slave_alloc(struct scsi_device *SDptr)
 {
         struct esp_device *esp_dev =
-                kmalloc(sizeof(struct esp_device), GFP_ATOMIC);
+                kzalloc(sizeof(struct esp_device), GFP_ATOMIC);
 
         if (!esp_dev)
                 return -ENOMEM;
-        memset(esp_dev, 0, sizeof(struct esp_device));
         SDptr->hostdata = esp_dev;
         return 0;
 }
diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c
index f12864abed2f..3a8089705feb 100644
--- a/drivers/scsi/NCR_D700.c
+++ b/drivers/scsi/NCR_D700.c
@@ -181,13 +181,12 @@ NCR_D700_probe_one(struct NCR_D700_private *p, int siop, int irq,
         struct Scsi_Host *host;
         int ret;
 
-        hostdata = kmalloc(sizeof(*hostdata), GFP_KERNEL);
+        hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL);
         if (!hostdata) {
                 printk(KERN_ERR "NCR D700: SIOP%d: Failed to allocate host"
                        "data, detatching\n", siop);
                 return -ENOMEM;
         }
-        memset(hostdata, 0, sizeof(*hostdata));
 
         if (!request_region(region, 64, "NCR_D700")) {
                 printk(KERN_ERR "NCR D700: Failed to reserve IO region 0x%x\n",
diff --git a/drivers/scsi/NCR_Q720.c b/drivers/scsi/NCR_Q720.c
index 778844c3544a..a8bbdc2273b8 100644
--- a/drivers/scsi/NCR_Q720.c
+++ b/drivers/scsi/NCR_Q720.c
@@ -148,11 +148,10 @@ NCR_Q720_probe(struct device *dev)
         __u32 base_addr, mem_size;
         void __iomem *mem_base;
 
-        p = kmalloc(sizeof(*p), GFP_KERNEL);
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
         if (!p)
                 return -ENOMEM;
 
-        memset(p, 0, sizeof(*p));
         pos2 = mca_device_read_pos(mca_dev, 2);
         /* enable device */
         pos2 |=  NCR_Q720_POS2_BOARD_ENABLE | NCR_Q720_POS2_INTERRUPT_ENABLE;
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 0464c182c577..005d2b05f32d 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -1159,11 +1159,10 @@ static int __imm_attach(struct parport *pb)
 
         init_waitqueue_head(&waiting);
 
-        dev = kmalloc(sizeof(imm_struct), GFP_KERNEL);
+        dev = kzalloc(sizeof(imm_struct), GFP_KERNEL);
         if (!dev)
                 return -ENOMEM;
 
-        memset(dev, 0, sizeof(imm_struct));
 
         dev->base = -1;
         dev->mode = IMM_AUTODETECT;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 9f8ed6b81576..492a51bd6aa8 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -7068,14 +7068,13 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
         subdevice_id = pci_dev->subsystem_device;
 
         /* found a controller */
-        ha = kmalloc(sizeof (ips_ha_t), GFP_KERNEL);
+        ha = kzalloc(sizeof (ips_ha_t), GFP_KERNEL);
         if (ha == NULL) {
                 IPS_PRINTK(KERN_WARNING, pci_dev,
                            "Unable to allocate temporary ha struct\n");
                 return -1;
         }
 
-        memset(ha, 0, sizeof (ips_ha_t));
 
         ips_sh[index] = NULL;
         ips_ha[index] = ha;
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index 5c32a69e41ba..3126824da36d 100644
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -101,13 +101,12 @@ lasi700_probe(struct parisc_device *dev)
         struct NCR_700_Host_Parameters *hostdata;
         struct Scsi_Host *host;
 
-        hostdata = kmalloc(sizeof(*hostdata), GFP_KERNEL);
+        hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL);
         if (!hostdata) {
                 printk(KERN_ERR "%s: Failed to allocate host data\n",
                        dev->dev.bus_id);
                 return -ENOMEM;
         }
-        memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters));
 
         hostdata->dev = &dev->dev;
         dma_set_mask(&dev->dev, DMA_32BIT_MASK);
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index f81f85ee190f..07bd0dcdf0d6 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1830,7 +1830,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         /* Initialize and populate the iocb list per host.  */
         INIT_LIST_HEAD(&phba->lpfc_iocb_list);
         for (i = 0; i < LPFC_IOCB_LIST_CNT; i++) {
-                iocbq_entry = kmalloc(sizeof(struct lpfc_iocbq), GFP_KERNEL);
+                iocbq_entry = kzalloc(sizeof(struct lpfc_iocbq), GFP_KERNEL);
                 if (iocbq_entry == NULL) {
                         printk(KERN_ERR "%s: only allocated %d iocbs of "
                                 "expected %d count. Unloading driver.\n",
@@ -1839,7 +1839,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                         goto out_free_iocbq;
                 }
 
-                memset(iocbq_entry, 0, sizeof(struct lpfc_iocbq));
                 iotag = lpfc_sli_next_iotag(phba, iocbq_entry);
                 if (iotag == 0) {
                         kfree (iocbq_entry);
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index c46685a03a9f..c6a53dccc16a 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -454,7 +454,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         pci_set_master(pdev);
 
         // Allocate the per driver initialization structure
-        adapter = kmalloc(sizeof(adapter_t), GFP_KERNEL);
+        adapter = kzalloc(sizeof(adapter_t), GFP_KERNEL);
 
         if (adapter == NULL) {
                 con_log(CL_ANN, (KERN_WARNING
@@ -462,7 +462,6 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
                 goto out_probe_one;
         }
-        memset(adapter, 0, sizeof(adapter_t));
 
 
         // set up PCI related soft state and other pre-known parameters
@@ -746,10 +745,9 @@ megaraid_init_mbox(adapter_t *adapter)
          * Allocate and initialize the init data structure for mailbox
          * controllers
          */
-        raid_dev = kmalloc(sizeof(mraid_device_t), GFP_KERNEL);
+        raid_dev = kzalloc(sizeof(mraid_device_t), GFP_KERNEL);
         if (raid_dev == NULL) return -1;
 
-        memset(raid_dev, 0, sizeof(mraid_device_t));
 
         /*
          * Attach the adapter soft state to raid device soft state
@@ -1050,8 +1048,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
          * since the calling routine does not yet know the number of available
          * commands.
          */
-        adapter->kscb_list = kmalloc(sizeof(scb_t) * MBOX_MAX_SCSI_CMDS,
-                        GFP_KERNEL);
+        adapter->kscb_list = kcalloc(MBOX_MAX_SCSI_CMDS, sizeof(scb_t), GFP_KERNEL);
 
         if (adapter->kscb_list == NULL) {
                 con_log(CL_ANN, (KERN_WARNING
@@ -1059,7 +1056,6 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
                         __LINE__));
                 goto out_free_ibuf;
         }
-        memset(adapter->kscb_list, 0, sizeof(scb_t) * MBOX_MAX_SCSI_CMDS);
 
         // memory allocation for our command packets
         if (megaraid_mbox_setup_dma_pools(adapter) != 0) {
@@ -3495,8 +3491,7 @@ megaraid_cmm_register(adapter_t *adapter)
         int             i;
 
         // Allocate memory for the base list of scb for management module.
-        adapter->uscb_list = kmalloc(sizeof(scb_t) * MBOX_MAX_USER_CMDS,
-                        GFP_KERNEL);
+        adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
 
         if (adapter->uscb_list == NULL) {
                 con_log(CL_ANN, (KERN_WARNING
@@ -3504,7 +3499,6 @@ megaraid_cmm_register(adapter_t *adapter)
                         __LINE__));
                 return -1;
         }
-        memset(adapter->uscb_list, 0, sizeof(scb_t) * MBOX_MAX_USER_CMDS);
 
 
         // Initialize the synchronization parameters for resources for
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 84d9c27133d4..b6587a6d8486 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -890,12 +890,11 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
         if (lld_adp->drvr_type != DRVRTYPE_MBOX)
                 return (-EINVAL);
 
-        adapter = kmalloc(sizeof(mraid_mmadp_t), GFP_KERNEL);
+        adapter = kzalloc(sizeof(mraid_mmadp_t), GFP_KERNEL);
 
         if (!adapter)
                 return -ENOMEM;
 
-        memset(adapter, 0, sizeof(mraid_mmadp_t));
 
         adapter->unique_id      = lld_adp->unique_id;
         adapter->drvr_type      = lld_adp->drvr_type;
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index b7f2e613c903..ebb948c016bb 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -1636,15 +1636,13 @@ static int megasas_alloc_cmds(struct megasas_instance *instance)
          * Allocate the dynamic array first and then allocate individual
          * commands.
          */
-        instance->cmd_list = kmalloc(sizeof(struct megasas_cmd *) * max_cmd,
-                                     GFP_KERNEL);
+        instance->cmd_list = kcalloc(max_cmd, sizeof(struct megasas_cmd*), GFP_KERNEL);
 
         if (!instance->cmd_list) {
                 printk(KERN_DEBUG "megasas: out of memory\n");
                 return -ENOMEM;
         }
 
-        memset(instance->cmd_list, 0, sizeof(struct megasas_cmd *) * max_cmd);
 
         for (i = 0; i < max_cmd; i++) {
                 instance->cmd_list[i] = kmalloc(sizeof(struct megasas_cmd),
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 370802d24acd..2dd0dc9a9aed 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -106,9 +106,8 @@ static int aha152x_probe(struct pcmcia_device *link)
     DEBUG(0, "aha152x_attach()\n");
 
     /* Create new SCSI device */
-    info = kmalloc(sizeof(*info), GFP_KERNEL);
+    info = kzalloc(sizeof(*info), GFP_KERNEL);
     if (!info) return -ENOMEM;
-    memset(info, 0, sizeof(*info));
     info->p_dev = link;
     link->priv = info;
 
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index c6f8c6e65e05..445cfbbca9b3 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1602,9 +1602,8 @@ static int nsp_cs_probe(struct pcmcia_device *link)
         nsp_dbg(NSP_DEBUG_INIT, "in");
 
         /* Create new SCSI device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) { return -ENOMEM; }
-        memset(info, 0, sizeof(*info));
         info->p_dev = link;
         link->priv = info;
         data->ScsiInfo = info;
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 697cfb76c3a4..67c5a58d17df 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -162,10 +162,9 @@ static int qlogic_probe(struct pcmcia_device *link)
         DEBUG(0, "qlogic_attach()\n");
 
         /* Create new SCSI device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
-        memset(info, 0, sizeof(*info));
         info->p_dev = link;
         link->priv = info;
         link->io.NumPorts1 = 16;
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 2695b7187b2f..961839ecfe86 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -875,10 +875,9 @@ SYM53C500_probe(struct pcmcia_device *link)
         DEBUG(0, "SYM53C500_attach()\n");
 
         /* Create new SCSI device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
-        memset(info, 0, sizeof(*info));
         info->p_dev = link;
         link->priv = info;
         link->io.NumPorts1 = 16;
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 2f1fa1eb7e90..67b6d76a6c8d 100644
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -1014,10 +1014,9 @@ static int __ppa_attach(struct parport *pb)
         int modes, ppb, ppb_hi;
         int err = -ENOMEM;
 
-        dev = kmalloc(sizeof(ppa_struct), GFP_KERNEL);
+        dev = kzalloc(sizeof(ppa_struct), GFP_KERNEL);
         if (!dev)
                 return -ENOMEM;
-        memset(dev, 0, sizeof(ppa_struct));
         dev->base = -1;
         dev->mode = PPA_AUTODETECT;
         dev->recon_tmo = PPA_RECON_TMO;
diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c
index 018c65f73ac4..710f19de3d40 100644
--- a/drivers/scsi/sim710.c
+++ b/drivers/scsi/sim710.c
@@ -100,7 +100,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
 {
         struct Scsi_Host * host = NULL;
         struct NCR_700_Host_Parameters *hostdata =
-                kmalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
+                kzalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
 
         printk(KERN_NOTICE "sim710: %s\n", dev->bus_id);
         printk(KERN_NOTICE "sim710: irq = %d, clock = %d, base = 0x%lx, scsi_id = %d\n",
@@ -110,7 +110,6 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
                 printk(KERN_ERR "sim710: Failed to allocate host data\n");
                 goto out;
         }
-        memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters));
 
         if(request_region(base_addr, 64, "sim710") == NULL) {
                 printk(KERN_ERR "sim710: Failed to reserve IO region 0x%lx\n",
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 14cba1ca38b3..5db1520f8ba9 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -2082,10 +2082,9 @@ static int dc390_slave_alloc(struct scsi_device *scsi_device)
         uint id = scsi_device->id;
         uint lun = scsi_device->lun;
 
-        pDCB = kmalloc(sizeof(struct dc390_dcb), GFP_KERNEL);
+        pDCB = kzalloc(sizeof(struct dc390_dcb), GFP_KERNEL);
         if (!pDCB)
                 return -ENOMEM;
-        memset(pDCB, 0, sizeof(struct dc390_dcb));
 
         if (!pACB->DCBCnt++) {
                 pACB->pLinkDCB = pDCB;