9 files changed, 10 insertions, 21 deletions

diff --git a/drivers/mtd/lpddr/qinfo_probe.c b/drivers/mtd/lpddr/qinfo_probe.c
index 79bf40f48b75..dbfe17baf046 100644
--- a/drivers/mtd/lpddr/qinfo_probe.c
+++ b/drivers/mtd/lpddr/qinfo_probe.c
@@ -134,13 +134,12 @@ out:
 static int lpddr_chip_setup(struct map_info *map, struct lpddr_private *lpddr)
 {
 
-        lpddr->qinfo = kmalloc(sizeof(struct qinfo_chip), GFP_KERNEL);
+        lpddr->qinfo = kzalloc(sizeof(struct qinfo_chip), GFP_KERNEL);
         if (!lpddr->qinfo) {
                 printk(KERN_WARNING "%s: no memory for LPDDR qinfo structure\n",
                                 map->name);
                 return 0;
         }
-        memset(lpddr->qinfo, 0, sizeof(struct qinfo_chip));
 
         /* Get the ManuID */
         lpddr->ManufactId = CMDVAL(map_read(map, map->pfow_base + PFOW_MANUFACTURER_ID));
@@ -185,13 +184,11 @@ static struct lpddr_private *lpddr_probe_chip(struct map_info *map)
         lpddr.numchips = 1;
 
         numvirtchips = lpddr.numchips * lpddr.qinfo->HWPartsNum;
-        retlpddr = kmalloc(sizeof(struct lpddr_private) +
+        retlpddr = kzalloc(sizeof(struct lpddr_private) +
                         numvirtchips * sizeof(struct flchip), GFP_KERNEL);
         if (!retlpddr)
                 return NULL;
 
-        memset(retlpddr, 0, sizeof(struct lpddr_private) +
-                                numvirtchips * sizeof(struct flchip));
         memcpy(retlpddr, &lpddr, sizeof(struct lpddr_private));
 
         retlpddr->numchips = numvirtchips;
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 1bdf0ee6d0b6..9639d83a9d6c 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -165,12 +165,11 @@ static int ixp2000_flash_probe(struct platform_device *dev)
                 return -EIO;
         }
 
-        info = kmalloc(sizeof(struct ixp2000_flash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct ixp2000_flash_info), GFP_KERNEL);
         if(!info) {
                 err = -ENOMEM;
                 goto Error;
         }
-        memset(info, 0, sizeof(struct ixp2000_flash_info));
 
         platform_set_drvdata(dev, info);
 
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 7513d90fee6f..e0a5e0426ead 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -196,12 +196,11 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
                         return err;
         }
 
-        info = kmalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL);
         if(!info) {
                 err = -ENOMEM;
                 goto Error;
         }
-        memset(info, 0, sizeof(struct ixp4xx_flash_info));
 
         platform_set_drvdata(dev, info);
 
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 91dc6331053f..dd90880048cf 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -63,11 +63,10 @@ static int __init pxa2xx_flash_probe(struct platform_device *pdev)
         if (!res)
                 return -ENODEV;
 
-        info = kmalloc(sizeof(struct pxa2xx_flash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct pxa2xx_flash_info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
-        memset(info, 0, sizeof(struct pxa2xx_flash_info));
         info->map.name = (char *) flash->name;
         info->map.bankwidth = flash->width;
         info->map.phys = res->start;
diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c
index 921a85df9196..6bc1b8276c62 100644
--- a/drivers/mtd/tests/mtd_pagetest.c
+++ b/drivers/mtd/tests/mtd_pagetest.c
@@ -480,12 +480,11 @@ static int scan_for_bad_eraseblocks(void)
 {
         int i, bad = 0;
 
-        bbt = kmalloc(ebcnt, GFP_KERNEL);
+        bbt = kzalloc(ebcnt, GFP_KERNEL);
         if (!bbt) {
                 printk(PRINT_PREF "error: cannot allocate memory\n");
                 return -ENOMEM;
         }
-        memset(bbt, 0 , ebcnt);
 
         printk(PRINT_PREF "scanning for bad eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
diff --git a/drivers/mtd/tests/mtd_readtest.c b/drivers/mtd/tests/mtd_readtest.c
index 7107fccbc7de..afe71aa15c4b 100644
--- a/drivers/mtd/tests/mtd_readtest.c
+++ b/drivers/mtd/tests/mtd_readtest.c
@@ -141,12 +141,11 @@ static int scan_for_bad_eraseblocks(void)
 {
         int i, bad = 0;
 
-        bbt = kmalloc(ebcnt, GFP_KERNEL);
+        bbt = kzalloc(ebcnt, GFP_KERNEL);
         if (!bbt) {
                 printk(PRINT_PREF "error: cannot allocate memory\n");
                 return -ENOMEM;
         }
-        memset(bbt, 0 , ebcnt);
 
         /* NOR flash does not implement block_isbad */
         if (mtd->block_isbad == NULL)
diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c
index 56ca62bb96bf..161feeb7b8b9 100644
--- a/drivers/mtd/tests/mtd_speedtest.c
+++ b/drivers/mtd/tests/mtd_speedtest.c
@@ -295,12 +295,11 @@ static int scan_for_bad_eraseblocks(void)
 {
         int i, bad = 0;
 
-        bbt = kmalloc(ebcnt, GFP_KERNEL);
+        bbt = kzalloc(ebcnt, GFP_KERNEL);
         if (!bbt) {
                 printk(PRINT_PREF "error: cannot allocate memory\n");
                 return -ENOMEM;
         }
-        memset(bbt, 0 , ebcnt);
 
         /* NOR flash does not implement block_isbad */
         if (mtd->block_isbad == NULL)
diff --git a/drivers/mtd/tests/mtd_stresstest.c b/drivers/mtd/tests/mtd_stresstest.c
index 3854afec56d0..531625fc9259 100644
--- a/drivers/mtd/tests/mtd_stresstest.c
+++ b/drivers/mtd/tests/mtd_stresstest.c
@@ -221,12 +221,11 @@ static int scan_for_bad_eraseblocks(void)
 {
         int i, bad = 0;
 
-        bbt = kmalloc(ebcnt, GFP_KERNEL);
+        bbt = kzalloc(ebcnt, GFP_KERNEL);
         if (!bbt) {
                 printk(PRINT_PREF "error: cannot allocate memory\n");
                 return -ENOMEM;
         }
-        memset(bbt, 0 , ebcnt);
 
         /* NOR flash does not implement block_isbad */
         if (mtd->block_isbad == NULL)
diff --git a/drivers/mtd/tests/mtd_subpagetest.c b/drivers/mtd/tests/mtd_subpagetest.c
index 700237a3d120..11204e8aab5f 100644
--- a/drivers/mtd/tests/mtd_subpagetest.c
+++ b/drivers/mtd/tests/mtd_subpagetest.c
@@ -354,12 +354,11 @@ static int scan_for_bad_eraseblocks(void)
 {
         int i, bad = 0;
 
-        bbt = kmalloc(ebcnt, GFP_KERNEL);
+        bbt = kzalloc(ebcnt, GFP_KERNEL);
         if (!bbt) {
                 printk(PRINT_PREF "error: cannot allocate memory\n");
                 return -ENOMEM;
         }
-        memset(bbt, 0 , ebcnt);
 
         printk(PRINT_PREF "scanning for bad eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {