10 files changed, 25 insertions, 54 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 8b9d85526596..c2f47923d174 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -3292,12 +3292,9 @@ static void ide_cd_release(struct kref *kref)
         ide_drive_t *drive = info->drive;
         struct gendisk *g = info->disk;
 
-        if (info->buffer != NULL)
-                kfree(info->buffer);
-        if (info->toc != NULL)
-                kfree(info->toc);
-        if (info->changer_info != NULL)
-                kfree(info->changer_info);
+        kfree(info->buffer);
+        kfree(info->toc);
+        kfree(info->changer_info);
         if (devinfo->handle == drive && unregister_cdrom(devinfo))
                 printk(KERN_ERR "%s: %s failed to unregister device from the cdrom "
                                 "driver.\n", __FUNCTION__, drive->name);
@@ -3455,7 +3452,7 @@ static int ide_cd_probe(struct device *dev)
                 printk(KERN_INFO "ide-cd: passing drive %s to ide-scsi emulation.\n", drive->name);
                 goto failed;
         }
-        info = kmalloc(sizeof(struct cdrom_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL);
         if (info == NULL) {
                 printk(KERN_ERR "%s: Can't allocate a cdrom structure\n", drive->name);
                 goto failed;
@@ -3469,8 +3466,6 @@ static int ide_cd_probe(struct device *dev)
 
         ide_register_subdriver(drive, &ide_cdrom_driver);
 
-        memset(info, 0, sizeof (struct cdrom_info));
-
         kref_init(&info->kref);
 
         info->drive = drive;
@@ -3489,12 +3484,9 @@ static int ide_cd_probe(struct device *dev)
         if (ide_cdrom_setup(drive)) {
                 struct cdrom_device_info *devinfo = &info->devinfo;
                 ide_unregister_subdriver(drive, &ide_cdrom_driver);
-                if (info->buffer != NULL)
-                        kfree(info->buffer);
-                if (info->toc != NULL)
-                        kfree(info->toc);
-                if (info->changer_info != NULL)
-                        kfree(info->changer_info);
+                kfree(info->buffer);
+                kfree(info->toc);
+                kfree(info->changer_info);
                 if (devinfo->handle == drive && unregister_cdrom(devinfo))
                         printk (KERN_ERR "%s: ide_cdrom_cleanup failed to unregister device from the cdrom driver.\n", drive->name);
                 kfree(info);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 234f5de3e929..e827b39e4b3c 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1215,7 +1215,7 @@ static int ide_disk_probe(struct device *dev)
         if (drive->media != ide_disk)
                 goto failed;
 
-        idkp = kmalloc(sizeof(*idkp), GFP_KERNEL);
+        idkp = kzalloc(sizeof(*idkp), GFP_KERNEL);
         if (!idkp)
                 goto failed;
 
@@ -1228,8 +1228,6 @@ static int ide_disk_probe(struct device *dev)
 
         ide_register_subdriver(drive, &idedisk_driver);
 
-        memset(idkp, 0, sizeof(*idkp));
-
         kref_init(&idkp->kref);
 
         idkp->drive = drive;
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 29c22fc278c6..e83f54d37f96 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -2146,7 +2146,7 @@ static int ide_floppy_probe(struct device *dev)
                 printk("ide-floppy: passing drive %s to ide-scsi emulation.\n", drive->name);
                 goto failed;
         }
-        if ((floppy = (idefloppy_floppy_t *) kmalloc (sizeof (idefloppy_floppy_t), GFP_KERNEL)) == NULL) {
+        if ((floppy = (idefloppy_floppy_t *) kzalloc (sizeof (idefloppy_floppy_t), GFP_KERNEL)) == NULL) {
                 printk (KERN_ERR "ide-floppy: %s: Can't allocate a floppy structure\n", drive->name);
                 goto failed;
         }
@@ -2159,8 +2159,6 @@ static int ide_floppy_probe(struct device *dev)
 
         ide_register_subdriver(drive, &idefloppy_driver);
 
-        memset(floppy, 0, sizeof(*floppy));
-
         kref_init(&floppy->kref);
 
         floppy->drive = drive;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index c1128ae5cd2f..02167a5b751d 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -596,14 +596,13 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
          *      Also note that 0 everywhere means "can't do X"
          */
  
-        drive->id = kmalloc(SECTOR_WORDS *4, GFP_KERNEL);
+        drive->id = kzalloc(SECTOR_WORDS *4, GFP_KERNEL);
         drive->id_read = 0;
         if(drive->id == NULL)
         {
                 printk(KERN_ERR "ide: out of memory for id data.\n");
                 return 0;
         }
-        memset(drive->id, 0, SECTOR_WORDS * 4);
         strcpy(drive->id->model, "UNKNOWN");
         
         /* skip probing? */
@@ -1316,10 +1315,8 @@ static void drive_release_dev (struct device *dev)
                 drive->devfs_name[0] = '\0';
         }
         ide_remove_drive_from_hwgroup(drive);
-        if (drive->id != NULL) {
-                kfree(drive->id);
-                drive->id = NULL;
-        }
+        kfree(drive->id);
+        drive->id = NULL;
         drive->present = 0;
         /* Messed up locking ... */
         spin_unlock_irq(&ide_lock);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 47f2b832555f..0ac7eb8f40d5 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -4850,7 +4850,7 @@ static int ide_tape_probe(struct device *dev)
                 printk(KERN_WARNING "ide-tape: Use drive %s with ide-scsi emulation and osst.\n", drive->name);
                 printk(KERN_WARNING "ide-tape: OnStream support will be removed soon from ide-tape!\n");
         }
-        tape = (idetape_tape_t *) kmalloc (sizeof (idetape_tape_t), GFP_KERNEL);
+        tape = (idetape_tape_t *) kzalloc (sizeof (idetape_tape_t), GFP_KERNEL);
         if (tape == NULL) {
                 printk(KERN_ERR "ide-tape: %s: Can't allocate a tape structure\n", drive->name);
                 goto failed;
@@ -4864,8 +4864,6 @@ static int ide_tape_probe(struct device *dev)
 
         ide_register_subdriver(drive, &idetape_driver);
 
-        memset(tape, 0, sizeof(*tape));
-
         kref_init(&tape->kref);
 
         tape->drive = drive;
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index ace8edad6e96..7ec18fa3b5ff 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -528,9 +528,8 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
 //      printk("IDE Taskfile ...\n");
 
-        req_task = kmalloc(tasksize, GFP_KERNEL);
+        req_task = kzalloc(tasksize, GFP_KERNEL);
         if (req_task == NULL) return -ENOMEM;
-        memset(req_task, 0, tasksize);
         if (copy_from_user(req_task, buf, tasksize)) {
                 kfree(req_task);
                 return -EFAULT;
@@ -541,12 +540,11 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         if (taskout) {
                 int outtotal = tasksize;
-                outbuf = kmalloc(taskout, GFP_KERNEL);
+                outbuf = kzalloc(taskout, GFP_KERNEL);
                 if (outbuf == NULL) {
                         err = -ENOMEM;
                         goto abort;
                 }
-                memset(outbuf, 0, taskout);
                 if (copy_from_user(outbuf, buf + outtotal, taskout)) {
                         err = -EFAULT;
                         goto abort;
@@ -555,12 +553,11 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         if (taskin) {
                 int intotal = tasksize + taskout;
-                inbuf = kmalloc(taskin, GFP_KERNEL);
+                inbuf = kzalloc(taskin, GFP_KERNEL);
                 if (inbuf == NULL) {
                         err = -ENOMEM;
                         goto abort;
                 }
-                memset(inbuf, 0, taskin);
                 if (copy_from_user(inbuf, buf + intotal, taskin)) {
                         err = -EFAULT;
                         goto abort;
@@ -649,10 +646,8 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
         }
 abort:
         kfree(req_task);
-        if (outbuf != NULL)
-                kfree(outbuf);
-        if (inbuf != NULL)
-                kfree(inbuf);
+        kfree(outbuf);
+        kfree(inbuf);
 
 //      printk("IDE Taskfile ioctl ended. rc = %i\n", err);
 
@@ -709,10 +704,9 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         if (args[3]) {
                 argsize = 4 + (SECTOR_WORDS * 4 * args[3]);
-                argbuf = kmalloc(argsize, GFP_KERNEL);
+                argbuf = kzalloc(argsize, GFP_KERNEL);
                 if (argbuf == NULL)
                         return -ENOMEM;
-                memcpy(argbuf, args, 4);
         }
         if (set_transfer(drive, &tfargs)) {
                 xfer_rate = args[1];
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 73ca8f73917d..9fe19808d815 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -864,9 +864,8 @@ static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int r
         down(&ide_setting_sem);
         while ((*p) && strcmp((*p)->name, name) < 0)
                 p = &((*p)->next);
-        if ((setting = kmalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
+        if ((setting = kzalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
                 goto abort;
-        memset(setting, 0, sizeof(*setting));
         if ((setting->name = kmalloc(strlen(name) + 1, GFP_KERNEL)) == NULL)
                 goto abort;
         strcpy(setting->name, name);
@@ -889,8 +888,7 @@ static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int r
         return 0;
 abort:
         up(&ide_setting_sem);
-        if (setting)
-                kfree(setting);
+        kfree(setting);
         return -1;
 }
 
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index a35a58bef1a4..1dafffa7e513 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -116,9 +116,8 @@ static dev_link_t *ide_attach(void)
     DEBUG(0, "ide_attach()\n");
 
     /* Create new ide device */
-    info = kmalloc(sizeof(*info), GFP_KERNEL);
+    info = kzalloc(sizeof(*info), GFP_KERNEL);
     if (!info) return NULL;
-    memset(info, 0, sizeof(*info));
     link = &info->link; link->priv = info;
 
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
@@ -221,9 +220,8 @@ static void ide_config(dev_link_t *link)
 
     DEBUG(0, "ide_config(0x%p)\n", link);
 
-    stk = kmalloc(sizeof(*stk), GFP_KERNEL);
+    stk = kzalloc(sizeof(*stk), GFP_KERNEL);
     if (!stk) goto err_mem;
-    memset(stk, 0, sizeof(*stk));
     cfg = &stk->parse.cftable_entry;
 
     tuple.TupleData = (cisdata_t *)&stk->buf;
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 127619a109ed..7b589d948bf9 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1516,7 +1516,7 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
 
 static void __devinit init_iops_hpt366(ide_hwif_t *hwif)
 {
-        struct hpt_info *info = kmalloc(sizeof(struct hpt_info), GFP_KERNEL);
+        struct hpt_info *info = kzalloc(sizeof(struct hpt_info), GFP_KERNEL);
         unsigned long dmabase = pci_resource_start(hwif->pci_dev, 4);
         u8 did, rid;
 
@@ -1524,7 +1524,6 @@ static void __devinit init_iops_hpt366(ide_hwif_t *hwif)
                 printk(KERN_WARNING "hpt366: out of memory.\n");
                 return;
         }
-        memset(info, 0, sizeof(struct hpt_info));
         ide_set_hwifdata(hwif, info);
 
         if(dmabase) {
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index e440036e651f..108fda83fea4 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -642,14 +642,13 @@ static void __devinit it821x_fixups(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
 {
-        struct it821x_dev *idev = kmalloc(sizeof(struct it821x_dev), GFP_KERNEL);
+        struct it821x_dev *idev = kzalloc(sizeof(struct it821x_dev), GFP_KERNEL);
         u8 conf;
 
         if(idev == NULL) {
                 printk(KERN_ERR "it821x: out of memory, falling back to legacy behaviour.\n");
                 goto fallback;
         }
-        memset(idev, 0, sizeof(struct it821x_dev));
         ide_set_hwifdata(hwif, idev);
 
         pci_read_config_byte(hwif->pci_dev, 0x50, &conf);