14 files changed, 18 insertions, 48 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 787e0d027f04..a7dc1370695b 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -501,12 +501,11 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
         struct locomo_dev *dev;
         int ret;
 
-        dev = kmalloc(sizeof(struct locomo_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct locomo_dev), GFP_KERNEL);
         if (!dev) {
                 ret = -ENOMEM;
                 goto out;
         }
-        memset(dev, 0, sizeof(struct locomo_dev));
 
         strncpy(dev->dev.bus_id,info->name,sizeof(dev->dev.bus_id));
         /*
@@ -664,12 +663,10 @@ __locomo_probe(struct device *me, struct resource *mem, int irq)
         unsigned long r;
         int i, ret = -ENODEV;
 
-        lchip = kmalloc(sizeof(struct locomo), GFP_KERNEL);
+        lchip = kzalloc(sizeof(struct locomo), GFP_KERNEL);
         if (!lchip)
                 return -ENOMEM;
 
-        memset(lchip, 0, sizeof(struct locomo));
-
         spin_lock_init(&lchip->lock);
 
         lchip->dev = me;
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 5ba1ee042349..3f68db84e5e6 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -541,12 +541,11 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
         struct sa1111_dev *dev;
         int ret;
 
-        dev = kmalloc(sizeof(struct sa1111_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct sa1111_dev), GFP_KERNEL);
         if (!dev) {
                 ret = -ENOMEM;
                 goto out;
         }
-        memset(dev, 0, sizeof(struct sa1111_dev));
 
         snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
                  "%4.4lx", info->offset);
@@ -621,12 +620,10 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
         unsigned int has_devs, val;
         int i, ret = -ENODEV;
 
-        sachip = kmalloc(sizeof(struct sa1111), GFP_KERNEL);
+        sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL);
         if (!sachip)
                 return -ENOMEM;
 
-        memset(sachip, 0, sizeof(struct sa1111));
-
         sachip->clk = clk_get(me, "GPIO27_CLK");
         if (!sachip->clk) {
                 ret = PTR_ERR(sachip->clk);
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index a2dfe0b0f1ec..5e830f444c6c 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -132,12 +132,10 @@ int __init scoop_probe(struct platform_device *pdev)
         if (!mem)
                 return -EINVAL;
 
-        devptr = kmalloc(sizeof(struct scoop_dev), GFP_KERNEL);
-
+        devptr = kzalloc(sizeof(struct scoop_dev), GFP_KERNEL);
         if (!devptr)
-                return  -ENOMEM;
+                return -ENOMEM;
 
-        memset(devptr, 0, sizeof(struct scoop_dev));
         spin_lock_init(&devptr->scoop_lock);
 
         inf = pdev->dev.platform_data;
diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index 766b6c05c6db..2bed290fec76 100644
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -357,10 +357,8 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kmalloc(sizeof(*as), GFP_KERNEL);
+        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
-                memset(as, 0, sizeof(*as));
-
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
                  * process accounting. If the device is opened by root, we
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index c4923fac8dff..de606dfa8db9 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -540,12 +540,10 @@ static void __init pcibios_init_hw(struct hw_pci *hw)
         int nr, busnr;
 
         for (nr = busnr = 0; nr < hw->nr_controllers; nr++) {
-                sys = kmalloc(sizeof(struct pci_sys_data), GFP_KERNEL);
+                sys = kzalloc(sizeof(struct pci_sys_data), GFP_KERNEL);
                 if (!sys)
                         panic("PCI: unable to allocate sys data!");
 
-                memset(sys, 0, sizeof(struct pci_sys_data));
-
                 sys->hw      = hw;
                 sys->busnr   = busnr;
                 sys->swizzle = hw->swizzle;
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 74ea29c3205e..00aa225e8d95 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -807,14 +807,12 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
         unsigned long base;
         int i;
 
-        ec = kmalloc(sizeof(ecard_t), GFP_KERNEL);
+        ec = kzalloc(sizeof(ecard_t), GFP_KERNEL);
         if (!ec) {
                 ec = ERR_PTR(-ENOMEM);
                 goto nomem;
         }
 
-        memset(ec, 0, sizeof(ecard_t));
-
         ec->slot_no = slot;
         ec->type = type;
         ec->irq = NO_IRQ;
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
index e79884eea1f7..5dace2597838 100644
--- a/arch/arm/mach-footbridge/dc21285.c
+++ b/arch/arm/mach-footbridge/dc21285.c
@@ -255,14 +255,12 @@ int __init dc21285_setup(int nr, struct pci_sys_data *sys)
         if (nr || !footbridge_cfn_mode())
                 return 0;
 
-        res = kmalloc(sizeof(struct resource) * 2, GFP_KERNEL);
+        res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);
         if (!res) {
                 printk("out of memory for root bus resources");
                 return 0;
         }
 
-        memset(res, 0, sizeof(struct resource) * 2);
-
         res[0].flags = IORESOURCE_MEM;
         res[0].name  = "Footbridge non-prefetch";
         res[1].flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index a85d471c5bfa..92d79fb39311 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -355,12 +355,11 @@ static int impd1_probe(struct lm_device *dev)
         if (!request_mem_region(dev->resource.start, SZ_4K, "LM registers"))
                 return -EBUSY;
 
-        impd1 = kmalloc(sizeof(struct impd1_module), GFP_KERNEL);
+        impd1 = kzalloc(sizeof(struct impd1_module), GFP_KERNEL);
         if (!impd1) {
                 ret = -ENOMEM;
                 goto release_lm;
         }
-        memset(impd1, 0, sizeof(struct impd1_module));
 
         impd1->base = ioremap(dev->resource.start, SZ_4K);
         if (!impd1->base) {
@@ -389,12 +388,10 @@ static int impd1_probe(struct lm_device *dev)
 
                 pc_base = dev->resource.start + idev->offset;
 
-                d = kmalloc(sizeof(struct amba_device), GFP_KERNEL);
+                d = kzalloc(sizeof(struct amba_device), GFP_KERNEL);
                 if (!d)
                         continue;
 
-                memset(d, 0, sizeof(struct amba_device));
-
                 snprintf(d->dev.bus_id, sizeof(d->dev.bus_id),
                          "lm%x:%5.5lx", dev->id, idev->offset >> 12);
 
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index d8d3c2a5a97e..6d65c96ebfd2 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -319,12 +319,10 @@ static void __init ap_init(void)
                 if ((sc_dec & (16 << i)) == 0)
                         continue;
 
-                lmdev = kmalloc(sizeof(struct lm_device), GFP_KERNEL);
+                lmdev = kzalloc(sizeof(struct lm_device), GFP_KERNEL);
                 if (!lmdev)
                         continue;
 
-                memset(lmdev, 0, sizeof(struct lm_device));
-
                 lmdev->resource.start = 0xc0000000 + 0x10000000 * i;
                 lmdev->resource.end = lmdev->resource.start + 0x0fffffff;
                 lmdev->resource.flags = IORESOURCE_MEM;
diff --git a/arch/arm/mach-iop3xx/iq31244-pci.c b/arch/arm/mach-iop3xx/iq31244-pci.c
index c6a973ba8fc6..f3c6413fa5bd 100644
--- a/arch/arm/mach-iop3xx/iq31244-pci.c
+++ b/arch/arm/mach-iop3xx/iq31244-pci.c
@@ -74,12 +74,10 @@ static int iq31244_setup(int nr, struct pci_sys_data *sys)
         if(nr != 0)
                 return 0;
 
-        res = kmalloc(sizeof(struct resource) * 2, GFP_KERNEL);
+        res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);
         if (!res)
                 panic("PCI: unable to alloc resources");
 
-        memset(res, 0, sizeof(struct resource) * 2);
-
         res[0].start = IOP321_PCI_LOWER_IO_VA;
         res[0].end   = IOP321_PCI_UPPER_IO_VA;
         res[0].name  = "IQ31244 PCI I/O Space";
diff --git a/arch/arm/mach-iop3xx/iq80321-pci.c b/arch/arm/mach-iop3xx/iq80321-pci.c
index 802f6d091b75..d9758d3f6e7f 100644
--- a/arch/arm/mach-iop3xx/iq80321-pci.c
+++ b/arch/arm/mach-iop3xx/iq80321-pci.c
@@ -68,12 +68,10 @@ static int iq80321_setup(int nr, struct pci_sys_data *sys)
         if(nr != 0)
                 return 0;
 
-        res = kmalloc(sizeof(struct resource) * 2, GFP_KERNEL);
+        res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);
         if (!res)
                 panic("PCI: unable to alloc resources");
 
-        memset(res, 0, sizeof(struct resource) * 2);
-
         res[0].start = IOP321_PCI_LOWER_IO_VA;
         res[0].end   = IOP321_PCI_UPPER_IO_VA;
         res[0].name  = "IQ80321 PCI I/O Space";
diff --git a/arch/arm/mach-iop3xx/iq80331-pci.c b/arch/arm/mach-iop3xx/iq80331-pci.c
index 654e450a1311..40d861002492 100644
--- a/arch/arm/mach-iop3xx/iq80331-pci.c
+++ b/arch/arm/mach-iop3xx/iq80331-pci.c
@@ -64,12 +64,10 @@ static int iq80331_setup(int nr, struct pci_sys_data *sys)
         if(nr != 0)
                 return 0;
 
-        res = kmalloc(sizeof(struct resource) * 2, GFP_KERNEL);
+        res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);
         if (!res)
                 panic("PCI: unable to alloc resources");
 
-        memset(res, 0, sizeof(struct resource) * 2);
-
         res[0].start = IOP331_PCI_LOWER_IO_VA;
         res[0].end   = IOP331_PCI_UPPER_IO_VA;
         res[0].name  = "IQ80331 PCI I/O Space";
diff --git a/arch/arm/mach-iop3xx/iq80332-pci.c b/arch/arm/mach-iop3xx/iq80332-pci.c
index 65951ffe4631..afc0676318e4 100644
--- a/arch/arm/mach-iop3xx/iq80332-pci.c
+++ b/arch/arm/mach-iop3xx/iq80332-pci.c
@@ -70,12 +70,10 @@ static int iq80332_setup(int nr, struct pci_sys_data *sys)
         if(nr != 0)
                 return 0;
 
-        res = kmalloc(sizeof(struct resource) * 2, GFP_KERNEL);
+        res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);
         if (!res)
                 panic("PCI: unable to alloc resources");
 
-        memset(res, 0, sizeof(struct resource) * 2);
-
         res[0].start = IOP331_PCI_LOWER_IO_VA;
         res[0].end   = IOP331_PCI_UPPER_IO_VA;
         res[0].name  = "IQ80332 PCI I/O Space";
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index 6e3462ed5306..2d40fe1145f0 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -463,7 +463,7 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
         if (nr >= 1)
                 return 0;
 
-        res = kmalloc(sizeof(*res) * 2, GFP_KERNEL);
+        res = kzalloc(sizeof(*res) * 2, GFP_KERNEL);
         if (res == NULL) {
                 /* 
                  * If we're out of memory this early, something is wrong,
@@ -471,7 +471,6 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
                  */
                 panic("PCI: unable to allocate resources?\n");
         }
-        memset(res, 0, sizeof(*res) * 2);
 
         local_write_config(PCI_COMMAND, 2, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);