41 files changed, 53 insertions, 125 deletions

diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c
index 90ed375c9b90..f87e06f6bab9 100644
--- a/arch/ppc/platforms/ev64360.c
+++ b/arch/ppc/platforms/ev64360.c
@@ -358,13 +358,12 @@ ev64360_setup_mtd(void)
 
         ptbl_entries = 3;
 
-        if ((ptbl = kmalloc(ptbl_entries * sizeof(struct mtd_partition),
+        if ((ptbl = kzalloc(ptbl_entries * sizeof(struct mtd_partition),
                 GFP_KERNEL)) == NULL) {
 
                 printk(KERN_WARNING "Can't alloc MTD partition table\n");
                 return -ENOMEM;
         }
-        memset(ptbl, 0, ptbl_entries * sizeof(struct mtd_partition));
 
         ptbl[0].name = "reserved";
         ptbl[0].offset = 0;
diff --git a/drivers/mtd/afs.c b/drivers/mtd/afs.c
index 6a45be04564b..52d51eb91c16 100644
--- a/drivers/mtd/afs.c
+++ b/drivers/mtd/afs.c
@@ -207,11 +207,10 @@ static int parse_afs_partitions(struct mtd_info *mtd,
         if (!sz)
                 return ret;
 
-        parts = kmalloc(sz, GFP_KERNEL);
+        parts = kzalloc(sz, GFP_KERNEL);
         if (!parts)
                 return -ENOMEM;
 
-        memset(parts, 0, sz);
         str = (char *)(parts + idx);
 
         /*
diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
index 16eaca69fb5a..e7999f15d85a 100644
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
@@ -643,13 +643,12 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
         int reg_idx;
         int offset;
 
-        mtd = (struct mtd_info*)kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         if (!mtd) {
                 printk(KERN_WARNING
                        "%s: kmalloc failed for info structure\n", map->name);
                 return NULL;
         }
-        memset(mtd, 0, sizeof(*mtd));
         mtd->priv = map;
 
         memset(&temp, 0, sizeof(temp));
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index e24973636e61..11de54535526 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -337,12 +337,11 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
         struct mtd_info *mtd;
         int i;
 
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         if (!mtd) {
                 printk(KERN_ERR "Failed to allocate memory for MTD device\n");
                 return NULL;
         }
-        memset(mtd, 0, sizeof(*mtd));
         mtd->priv = map;
         mtd->type = MTD_NORFLASH;
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index ca0882b5819f..e3acd398fb37 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -257,12 +257,11 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
         struct mtd_info *mtd;
         int i;
 
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         if (!mtd) {
                 printk(KERN_WARNING "Failed to allocate memory for MTD device\n");
                 return NULL;
         }
-        memset(mtd, 0, sizeof(*mtd));
         mtd->priv = map;
         mtd->type = MTD_NORFLASH;
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index fae70a5db540..d56849f5f107 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -172,7 +172,7 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
         int i,j;
         unsigned long devsize = (1<<cfi->cfiq->DevSize) * cfi->interleave;
 
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         //printk(KERN_DEBUG "number of CFI chips: %d\n", cfi->numchips);
 
         if (!mtd) {
@@ -181,7 +181,6 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
                 return NULL;
         }
 
-        memset(mtd, 0, sizeof(*mtd));
         mtd->priv = map;
         mtd->type = MTD_NORFLASH;
         mtd->size = devsize * cfi->numchips;
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index cdb0f590b40c..77843d560ae4 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -113,13 +113,12 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
         }
 
         mapsize = (max_chips + BITS_PER_LONG-1) / BITS_PER_LONG;
-        chip_map = kmalloc(mapsize, GFP_KERNEL);
+        chip_map = kzalloc(mapsize, GFP_KERNEL);
         if (!chip_map) {
                 printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map->name);
                 kfree(cfi.cfiq);
                 return NULL;
         }
-        memset (chip_map, 0, mapsize);
 
         set_bit(0, chip_map); /* Mark first chip valid */
 
diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c
index 2c3f019197c1..14e57b2bf842 100644
--- a/drivers/mtd/chips/jedec.c
+++ b/drivers/mtd/chips/jedec.c
@@ -116,11 +116,10 @@ static struct mtd_info *jedec_probe(struct map_info *map)
    char Part[200];
    memset(&priv,0,sizeof(priv));
 
-   MTD = kmalloc(sizeof(struct mtd_info) + sizeof(struct jedec_private), GFP_KERNEL);
+   MTD = kzalloc(sizeof(struct mtd_info) + sizeof(struct jedec_private), GFP_KERNEL);
    if (!MTD)
            return NULL;
 
-   memset(MTD, 0, sizeof(struct mtd_info) + sizeof(struct jedec_private));
    priv = (struct jedec_private *)&MTD[1];
 
    my_bank_size = map->size;
diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c
index ac01a949b687..fc478c0f93f5 100644
--- a/drivers/mtd/chips/map_absent.c
+++ b/drivers/mtd/chips/map_absent.c
@@ -47,13 +47,11 @@ static struct mtd_info *map_absent_probe(struct map_info *map)
 {
         struct mtd_info *mtd;
 
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         if (!mtd) {
                 return NULL;
         }
 
-        memset(mtd, 0, sizeof(*mtd));
-
         map->fldrv      = &map_absent_chipdrv;
         mtd->priv       = map;
         mtd->name       = map->name;
diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c
index 3a66680abfd0..5cb6d5263661 100644
--- a/drivers/mtd/chips/map_ram.c
+++ b/drivers/mtd/chips/map_ram.c
@@ -55,12 +55,10 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
 #endif
         /* OK. It seems to be RAM. */
 
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         if (!mtd)
                 return NULL;
 
-        memset(mtd, 0, sizeof(*mtd));
-
         map->fldrv = &mapram_chipdrv;
         mtd->priv = map;
         mtd->name = map->name;
diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
index 1b328b1378fd..cb27f855074c 100644
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
@@ -31,12 +31,10 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
 {
         struct mtd_info *mtd;
 
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         if (!mtd)
                 return NULL;
 
-        memset(mtd, 0, sizeof(*mtd));
-
         map->fldrv = &maprom_chipdrv;
         mtd->priv = map;
         mtd->name = map->name;
diff --git a/drivers/mtd/chips/sharp.c b/drivers/mtd/chips/sharp.c
index 967abbecdff9..c9cd3d21ccfa 100644
--- a/drivers/mtd/chips/sharp.c
+++ b/drivers/mtd/chips/sharp.c
@@ -112,18 +112,16 @@ static struct mtd_info *sharp_probe(struct map_info *map)
         struct sharp_info *sharp = NULL;
         int width;
 
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         if(!mtd)
                 return NULL;
 
-        sharp = kmalloc(sizeof(*sharp), GFP_KERNEL);
+        sharp = kzalloc(sizeof(*sharp), GFP_KERNEL);
         if(!sharp) {
                 kfree(mtd);
                 return NULL;
         }
 
-        memset(mtd, 0, sizeof(*mtd));
-
         width = sharp_probe_map(map,mtd);
         if(!width){
                 kfree(mtd);
@@ -143,7 +141,6 @@ static struct mtd_info *sharp_probe(struct map_info *map)
         mtd->writesize = 1;
         mtd->name = map->name;
 
-        memset(sharp, 0, sizeof(*sharp));
         sharp->chipshift = 23;
         sharp->numchips = 1;
         sharp->chips[0].start = 0;
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index 3402ce448702..23fab14f1637 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -163,13 +163,12 @@ static struct mtd_partition * newpart(char *s,
                 *num_parts = this_part + 1;
                 alloc_size = *num_parts * sizeof(struct mtd_partition) +
                              extra_mem_size;
-                parts = kmalloc(alloc_size, GFP_KERNEL);
+                parts = kzalloc(alloc_size, GFP_KERNEL);
                 if (!parts)
                 {
                         printk(KERN_ERR ERRP "out of memory\n");
                         return NULL;
                 }
-                memset(parts, 0, alloc_size);
                 extra_mem = (unsigned char *)(parts + *num_parts);
         }
         /* enter this partition (offset will be calculated later if it is zero at this point) */
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 401c6a294baa..6d917a4daa9d 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -295,10 +295,9 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
         if (!devname)
                 return NULL;
 
-        dev = kmalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
-        memset(dev, 0, sizeof(*dev));
 
         /* Get a handle on the device */
         bdev = open_bdev_excl(devname, O_RDWR, NULL);
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c
index 08dfb899b272..9cff119a2024 100644
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
@@ -131,11 +131,10 @@ static int __init ms02nv_init_one(ulong addr)
         int ret = -ENODEV;
 
         /* The module decodes 8MiB of address space. */
-        mod_res = kmalloc(sizeof(*mod_res), GFP_KERNEL);
+        mod_res = kzalloc(sizeof(*mod_res), GFP_KERNEL);
         if (!mod_res)
                 return -ENOMEM;
 
-        memset(mod_res, 0, sizeof(*mod_res));
         mod_res->name = ms02nv_name;
         mod_res->start = addr;
         mod_res->end = addr + MS02NV_SLOT_SIZE - 1;
@@ -153,24 +152,21 @@ static int __init ms02nv_init_one(ulong addr)
         }
 
         ret = -ENOMEM;
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
         if (!mtd)
                 goto err_out_mod_res_rel;
-        memset(mtd, 0, sizeof(*mtd));
-        mp = kmalloc(sizeof(*mp), GFP_KERNEL);
+        mp = kzalloc(sizeof(*mp), GFP_KERNEL);
         if (!mp)
                 goto err_out_mtd;
-        memset(mp, 0, sizeof(*mp));
 
         mtd->priv = mp;
         mp->resource.module = mod_res;
 
         /* Firmware's diagnostic NVRAM area. */
-        diag_res = kmalloc(sizeof(*diag_res), GFP_KERNEL);
+        diag_res = kzalloc(sizeof(*diag_res), GFP_KERNEL);
         if (!diag_res)
                 goto err_out_mp;
 
-        memset(diag_res, 0, sizeof(*diag_res));
         diag_res->name = ms02nv_res_diag_ram;
         diag_res->start = addr;
         diag_res->end = addr + MS02NV_RAM - 1;
@@ -180,11 +176,10 @@ static int __init ms02nv_init_one(ulong addr)
         mp->resource.diag_ram = diag_res;
 
         /* User-available general-purpose NVRAM area. */
-        user_res = kmalloc(sizeof(*user_res), GFP_KERNEL);
+        user_res = kzalloc(sizeof(*user_res), GFP_KERNEL);
         if (!user_res)
                 goto err_out_diag_res;
 
-        memset(user_res, 0, sizeof(*user_res));
         user_res->name = ms02nv_res_user_ram;
         user_res->start = addr + MS02NV_RAM;
         user_res->end = addr + size - 1;
@@ -194,11 +189,10 @@ static int __init ms02nv_init_one(ulong addr)
         mp->resource.user_ram = user_res;
 
         /* Control and status register. */
-        csr_res = kmalloc(sizeof(*csr_res), GFP_KERNEL);
+        csr_res = kzalloc(sizeof(*csr_res), GFP_KERNEL);
         if (!csr_res)
                 goto err_out_user_res;
 
-        memset(csr_res, 0, sizeof(*csr_res));
         csr_res->name = ms02nv_res_csr;
         csr_res->start = addr + MS02NV_CSR;
         csr_res->end = addr + MS02NV_CSR + 3;
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 6c7337f9ebbb..56cc1ca7ffd5 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -126,12 +126,10 @@ static int register_device(char *name, unsigned long start, unsigned long len)
         struct phram_mtd_list *new;
         int ret = -ENOMEM;
 
-        new = kmalloc(sizeof(*new), GFP_KERNEL);
+        new = kzalloc(sizeof(*new), GFP_KERNEL);
         if (!new)
                 goto out0;
 
-        memset(new, 0, sizeof(*new));
-
         ret = -EIO;
         new->mtd.priv = ioremap(start, len);
         if (!new->mtd.priv) {
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 542a0c009006..5f49248a4856 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -168,19 +168,16 @@ static int register_device(char *name, unsigned long start, unsigned long length
                 E("slram: Cannot allocate new MTD device.\n");
                 return(-ENOMEM);
         }
-        (*curmtd)->mtdinfo = kmalloc(sizeof(struct mtd_info), GFP_KERNEL);
+        (*curmtd)->mtdinfo = kzalloc(sizeof(struct mtd_info), GFP_KERNEL);
         (*curmtd)->next = NULL;
 
         if ((*curmtd)->mtdinfo) {
-                memset((char *)(*curmtd)->mtdinfo, 0, sizeof(struct mtd_info));
                 (*curmtd)->mtdinfo->priv =
-                        kmalloc(sizeof(slram_priv_t), GFP_KERNEL);
+                        kzalloc(sizeof(slram_priv_t), GFP_KERNEL);
 
                 if (!(*curmtd)->mtdinfo->priv) {
                         kfree((*curmtd)->mtdinfo);
                         (*curmtd)->mtdinfo = NULL;
-                } else {
-                        memset((*curmtd)->mtdinfo->priv,0,sizeof(slram_priv_t));
                 }
         }
 
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index da39355132d8..24235d4f1d23 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -1033,7 +1033,7 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 {
         partition_t *partition;
 
-        partition = kmalloc(sizeof(partition_t), GFP_KERNEL);
+        partition = kzalloc(sizeof(partition_t), GFP_KERNEL);
 
         if (!partition) {
                 printk(KERN_WARNING "No memory to scan for FTL on %s\n",
@@ -1041,8 +1041,6 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
                 return;
         }
 
-        memset(partition, 0, sizeof(partition_t));
-
         partition->mbd.mtd = mtd;
 
         if ((scan_header(partition) == 0) &&
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index d2f54c037e0f..b0e396504e67 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -67,13 +67,12 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 
         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: add_mtd for %s\n", mtd->name);
 
-        inftl = kmalloc(sizeof(*inftl), GFP_KERNEL);
+        inftl = kzalloc(sizeof(*inftl), GFP_KERNEL);
 
         if (!inftl) {
                 printk(KERN_WARNING "INFTL: Out of memory for data structures\n");
                 return;
         }
-        memset(inftl, 0, sizeof(*inftl));
 
         inftl->mbd.mtd = mtd;
         inftl->mbd.devnum = -1;
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index 0402c21e291d..629e6e2641a8 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -122,10 +122,9 @@ static int __init clps_setup_mtd(struct clps_info *clps, int nr, struct mtd_info
         /*
          * Allocate the map_info structs in one go.
          */
-        maps = kmalloc(sizeof(struct map_info) * nr, GFP_KERNEL);
+        maps = kzalloc(sizeof(struct map_info) * nr, GFP_KERNEL);
         if (!maps)
                 return -ENOMEM;
-        memset(maps, 0, sizeof(struct map_info) * nr);
         /*
          * Claim and then map the memory regions.
          */
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index c8db01b3e45f..6946d802e6f6 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -75,14 +75,12 @@ static int armflash_probe(struct platform_device *dev)
         int err;
         void __iomem *base;
 
-        info = kmalloc(sizeof(struct armflash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct armflash_info), GFP_KERNEL);
         if (!info) {
                 err = -ENOMEM;
                 goto out;
         }
 
-        memset(info, 0, sizeof(struct armflash_info));
-
         info->plat = plat;
         if (plat && plat->init) {
                 err = plat->init();
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index 418afffb2d80..e8d9ae535673 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -78,12 +78,10 @@ static int __devinit omapflash_probe(struct platform_device *pdev)
         struct resource *res = pdev->resource;
         unsigned long size = res->end - res->start + 1;
 
-        info = kmalloc(sizeof(struct omapflash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct omapflash_info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
-        memset(info, 0, sizeof(struct omapflash_info));
-
         if (!request_mem_region(res->start, size, "flash")) {
                 err = -EBUSY;
                 goto out_free_info;
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 995347b1beba..eaeb56a4070a 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -735,11 +735,10 @@ static int pcmciamtd_probe(struct pcmcia_device *link)
         struct pcmciamtd_dev *dev;
 
         /* Create new memory card device */
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev) return -ENOMEM;
         DEBUG(1, "dev=0x%p", dev);
 
-        memset(dev, 0, sizeof(*dev));
         dev->p_dev = link;
         link->priv = dev;
 
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index bb67c505b1a5..28c5ffd75233 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -92,12 +92,11 @@ static int physmap_flash_probe(struct platform_device *dev)
             (unsigned long long)(dev->resource->end - dev->resource->start + 1),
             (unsigned long long)dev->resource->start);
 
-        info = kmalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
         if (info == NULL) {
                 err = -ENOMEM;
                 goto err_out;
         }
-        memset(info, 0, sizeof(*info));
 
         platform_set_drvdata(dev, info);
 
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 5d3c75451ca2..2b6504ecbbd1 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -147,14 +147,13 @@ static int platram_probe(struct platform_device *pdev)
 
         pdata = pdev->dev.platform_data;
 
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
                 dev_err(&pdev->dev, "no memory for flash info\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
 
-        memset(info, 0, sizeof(*info));
         platform_set_drvdata(pdev, info);
 
         info->dev = &pdev->dev;
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 950bf1c57841..f904e6bd02e0 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -273,14 +273,12 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
         /*
          * Allocate the map_info structs in one go.
          */
-        info = kmalloc(size, GFP_KERNEL);
+        info = kzalloc(size, GFP_KERNEL);
         if (!info) {
                 ret = -ENOMEM;
                 goto out;
         }
 
-        memset(info, 0, size);
-
         if (plat->init) {
                 ret = plat->init();
                 if (ret)
diff --git a/drivers/mtd/maps/tqm834x.c b/drivers/mtd/maps/tqm834x.c
index 58e5912bd381..9adc970e55e6 100644
--- a/drivers/mtd/maps/tqm834x.c
+++ b/drivers/mtd/maps/tqm834x.c
@@ -132,20 +132,16 @@ static int __init init_tqm834x_mtd(void)
 
                 pr_debug("%s: chip probing count %d\n", __FUNCTION__, idx);
 
-                map_banks[idx] =
-                        (struct map_info *)kmalloc(sizeof(struct map_info),
-                                                   GFP_KERNEL);
+                map_banks[idx] = kzalloc(sizeof(struct map_info), GFP_KERNEL);
                 if (map_banks[idx] == NULL) {
                         ret = -ENOMEM;
                         goto error_mem;
                 }
-                memset((void *)map_banks[idx], 0, sizeof(struct map_info));
-                map_banks[idx]->name = (char *)kmalloc(16, GFP_KERNEL);
+                map_banks[idx]->name = kzalloc(16, GFP_KERNEL);
                 if (map_banks[idx]->name == NULL) {
                         ret = -ENOMEM;
                         goto error_mem;
                 }
-                memset((void *)map_banks[idx]->name, 0, 16);
 
                 sprintf(map_banks[idx]->name, "TQM834x-%d", idx);
                 map_banks[idx]->size = flash_size;
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 19578ba84ee8..37e4ded9b600 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -134,14 +134,13 @@ int __init init_tqm_mtd(void)
 
                 printk(KERN_INFO "%s: chip probing count %d\n", __FUNCTION__, idx);
 
-                map_banks[idx] = (struct map_info *)kmalloc(sizeof(struct map_info), GFP_KERNEL);
+                map_banks[idx] = kzalloc(sizeof(struct map_info), GFP_KERNEL);
                 if(map_banks[idx] == NULL) {
                         ret = -ENOMEM;
                         /* FIXME: What if some MTD devices were probed already? */
                         goto error_mem;
                 }
 
-                memset((void *)map_banks[idx], 0, sizeof(struct map_info));
                 map_banks[idx]->name = (char *)kmalloc(16, GFP_KERNEL);
 
                 if (!map_banks[idx]->name) {
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index b5d62cb357da..b879a66daa9e 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -373,12 +373,10 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
         if (!blktrans_notifier.list.next)
                 register_mtd_user(&blktrans_notifier);
 
-        tr->blkcore_priv = kmalloc(sizeof(*tr->blkcore_priv), GFP_KERNEL);
+        tr->blkcore_priv = kzalloc(sizeof(*tr->blkcore_priv), GFP_KERNEL);
         if (!tr->blkcore_priv)
                 return -ENOMEM;
 
-        memset(tr->blkcore_priv, 0, sizeof(*tr->blkcore_priv));
-
         mutex_lock(&mtd_table_mutex);
 
         ret = register_blkdev(tr->major, tr->name);
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index a052648f6e31..952da30b1745 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -278,11 +278,10 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)
         }
 
         /* OK, it's not open. Create cache info for it */
-        mtdblk = kmalloc(sizeof(struct mtdblk_dev), GFP_KERNEL);
+        mtdblk = kzalloc(sizeof(struct mtdblk_dev), GFP_KERNEL);
         if (!mtdblk)
                 return -ENOMEM;
 
-        memset(mtdblk, 0, sizeof(*mtdblk));
         mtdblk->count = 1;
         mtdblk->mtd = mtd;
 
@@ -339,13 +338,11 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)
 
 static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 {
-        struct mtd_blktrans_dev *dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        struct mtd_blktrans_dev *dev = kzalloc(sizeof(*dev), GFP_KERNEL);
 
         if (!dev)
                 return;
 
-        memset(dev, 0, sizeof(*dev));
-
         dev->mtd = mtd;
         dev->devnum = mtd->index;
 
diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c
index 642ccc66f283..f79dbb49b1a2 100644
--- a/drivers/mtd/mtdblock_ro.c
+++ b/drivers/mtd/mtdblock_ro.c
@@ -33,13 +33,11 @@ static int mtdblock_writesect(struct mtd_blktrans_dev *dev,
 
 static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 {
-        struct mtd_blktrans_dev *dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        struct mtd_blktrans_dev *dev = kzalloc(sizeof(*dev), GFP_KERNEL);
 
         if (!dev)
                 return;
 
-        memset(dev, 0, sizeof(*dev));
-
         dev->mtd = mtd;
         dev->devnum = mtd->index;
 
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 07618f51d969..7c4adc641328 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -431,7 +431,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 if(!(file->f_mode & 2))
                         return -EPERM;
 
-                erase=kmalloc(sizeof(struct erase_info),GFP_KERNEL);
+                erase=kzalloc(sizeof(struct erase_info),GFP_KERNEL);
                 if (!erase)
                         ret = -ENOMEM;
                 else {
@@ -440,7 +440,6 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
 
                         init_waitqueue_head(&waitq);
 
-                        memset (erase,0,sizeof(struct erase_info));
                         if (copy_from_user(&erase->addr, argp,
                                     sizeof(struct erase_info_user))) {
                                 kfree(erase);
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index cf927a8803e7..ec51483b1c51 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -708,14 +708,13 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
 
         /* allocate the device structure */
         size = SIZEOF_STRUCT_MTD_CONCAT(num_devs);
-        concat = kmalloc(size, GFP_KERNEL);
+        concat = kzalloc(size, GFP_KERNEL);
         if (!concat) {
                 printk
                     ("memory allocation error while creating concatenated device \"%s\"\n",
                      name);
                 return NULL;
         }
-        memset(concat, 0, size);
         concat->subdev = (struct mtd_info **) (concat + 1);
 
         /*
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index a20f75fd8d61..89692f898ef4 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -323,14 +323,13 @@ int add_mtd_partitions(struct mtd_info *master,
         for (i = 0; i < nbparts; i++) {
 
                 /* allocate the partition structure */
-                slave = kmalloc (sizeof(*slave), GFP_KERNEL);
+                slave = kzalloc (sizeof(*slave), GFP_KERNEL);
                 if (!slave) {
                         printk ("memory allocation error while creating partitions for \"%s\"\n",
                                 master->name);
                         del_mtd_partitions(master);
                         return -ENOMEM;
                 }
-                memset(slave, 0, sizeof(*slave));
                 list_add(&slave->list, &mtd_partitions);
 
                 /* set up the MTD object for this partition */
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index 6107f532855b..12608c13cce5 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1635,13 +1635,12 @@ static int __init doc_probe(unsigned long physadr)
 
         len = sizeof(struct mtd_info) +
             sizeof(struct nand_chip) + sizeof(struct doc_priv) + (2 * sizeof(struct nand_bbt_descr));
-        mtd = kmalloc(len, GFP_KERNEL);
+        mtd = kzalloc(len, GFP_KERNEL);
         if (!mtd) {
                 printk(KERN_ERR "DiskOnChip kmalloc (%d bytes) failed!\n", len);
                 ret = -ENOMEM;
                 goto fail;
         }
-        memset(mtd, 0, len);
 
         nand                    = (struct nand_chip *) (mtd + 1);
         doc                     = (struct doc_priv *) (nand + 1);
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 4e74fe9af29e..5e121ceaa598 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -960,14 +960,12 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
         struct nand_bbt_descr *md = this->bbt_md;
 
         len = mtd->size >> (this->bbt_erase_shift + 2);
-        /* Allocate memory (2bit per block) */
-        this->bbt = kmalloc(len, GFP_KERNEL);
+        /* Allocate memory (2bit per block) and clear the memory bad block table */
+        this->bbt = kzalloc(len, GFP_KERNEL);
         if (!this->bbt) {
                 printk(KERN_ERR "nand_scan_bbt: Out of memory\n");
                 return -ENOMEM;
         }
-        /* Clear the memory bad block table */
-        memset(this->bbt, 0x00, len);
 
         /* If no primary table decriptor is given, scan the device
          * to build a memory based bad block table
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index abebcab47631..3d39451ae8f5 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -1511,14 +1511,12 @@ static int __init ns_init_module(void)
         }
 
         /* Allocate and initialize mtd_info, nand_chip and nandsim structures */
-        nsmtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip)
+        nsmtd = kzalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip)
                                 + sizeof(struct nandsim), GFP_KERNEL);
         if (!nsmtd) {
                 NS_ERR("unable to allocate core structures.\n");
                 return -ENOMEM;
         }
-        memset(nsmtd, 0, sizeof(struct mtd_info) + sizeof(struct nand_chip) +
-                        sizeof(struct nandsim));
         chip        = (struct nand_chip *)(nsmtd + 1);
         nsmtd->priv = (void *)chip;
         nand        = (struct nandsim *)(chip + 1);
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index f4d38546068f..4b1ba4fcfcd3 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -57,13 +57,12 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 
         DEBUG(MTD_DEBUG_LEVEL1, "NFTL: add_mtd for %s\n", mtd->name);
 
-        nftl = kmalloc(sizeof(struct NFTLrecord), GFP_KERNEL);
+        nftl = kzalloc(sizeof(struct NFTLrecord), GFP_KERNEL);
 
         if (!nftl) {
                 printk(KERN_WARNING "NFTL: out of memory for data structures\n");
                 return;
         }
-        memset(nftl, 0, sizeof(*nftl));
 
         nftl->mbd.mtd = mtd;
         nftl->mbd.devnum = -1;
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index af06a80f44de..53eb5632bdbb 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -45,12 +45,10 @@ static int __devinit generic_onenand_probe(struct device *dev)
         unsigned long size = res->end - res->start + 1;
         int err;
 
-        info = kmalloc(sizeof(struct onenand_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct onenand_info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
-        memset(info, 0, sizeof(struct onenand_info));
-
         if (!request_mem_region(res->start, size, dev->driver->name)) {
                 err = -EBUSY;
                 goto out_free_info;
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 1b00dac3d7d6..e3822c1cdb8d 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -177,14 +177,12 @@ int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
         int len, ret = 0;
 
         len = mtd->size >> (this->erase_shift + 2);
-        /* Allocate memory (2bit per block) */
-        bbm->bbt = kmalloc(len, GFP_KERNEL);
+        /* Allocate memory (2bit per block) and clear the memory bad block table */
+        bbm->bbt = kzalloc(len, GFP_KERNEL);
         if (!bbm->bbt) {
                 printk(KERN_ERR "onenand_scan_bbt: Out of memory\n");
                 return -ENOMEM;
         }
-        /* Clear the memory bad block table */
-        memset(bbm->bbt, 0x00, len);
 
         /* Set the bad block position */
         bbm->badblockpos = ONENAND_BADBLOCK_POS;
@@ -230,14 +228,12 @@ int onenand_default_bbt(struct mtd_info *mtd)
         struct onenand_chip *this = mtd->priv;
         struct bbm_info *bbm;
 
-        this->bbm = kmalloc(sizeof(struct bbm_info), GFP_KERNEL);
+        this->bbm = kzalloc(sizeof(struct bbm_info), GFP_KERNEL);
         if (!this->bbm)
                 return -ENOMEM;
 
         bbm = this->bbm;
 
-        memset(bbm, 0, sizeof(struct bbm_info));
-
         /* 1KB page has same configuration as 2KB page */
         if (!bbm->badblock_pattern)
                 bbm->badblock_pattern = &largepage_memorybased;
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 5b58523e4d4e..4b277211e27b 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -165,15 +165,13 @@ static int parse_redboot_partitions(struct mtd_info *master,
                 }
         }
 #endif
-        parts = kmalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
+        parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
 
         if (!parts) {
                 ret = -ENOMEM;
                 goto out;
         }
 
-        memset(parts, 0, sizeof(*parts)*nrparts + nulllen + namelen);
-
         nullname = (char *)&parts[nrparts];
 #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
         if (nulllen > 0) {