[SPARC]: Replace kmalloc+memset with kzalloc

Replace kmalloc+memset with kzalloc

Signed-off-by: Yan Burman <burman.yan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 5 insertions, 10 deletions

diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 54d51b40460..cbbc98846b0 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -317,9 +317,8 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
         if ((va = __get_free_pages(GFP_KERNEL|__GFP_COMP, order)) == 0)
                 goto err_nopages;
 
-        if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL)
+        if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL)
                 goto err_nomem;
-        memset((char*)res, 0, sizeof(struct resource));
 
         if (allocate_resource(&_sparc_dvma, res, len_total,
             _sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) {
@@ -589,12 +588,11 @@ void *pci_alloc_consistent(struct pci_dev *pdev, size_t len, dma_addr_t *pba)
                 return NULL;
         }
 
-        if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {
+        if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {
                 free_pages(va, order);
                 printk("pci_alloc_consistent: no core\n");
                 return NULL;
         }
-        memset((char*)res, 0, sizeof(struct resource));
 
         if (allocate_resource(&_sparc_dvma, res, len_total,
             _sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) {
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index 46200c43ffb..dab6169e31c 100644
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@ -793,10 +793,9 @@ struct of_device* of_platform_device_create(struct device_node *np,
 {
         struct of_device *dev;
 
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
-        memset(dev, 0, sizeof(*dev));
 
         dev->dev.parent = parent;
         dev->dev.bus = bus;
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index d4f9da8170c..b8bd53ab29c 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -545,8 +545,7 @@ void __init sun4d_init_sbi_irq(void)
         nsbi = 0;
         for_each_sbus(sbus)
                 nsbi++;
-        sbus_actions = (struct sbus_action *)kmalloc (nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);
-        memset (sbus_actions, 0, (nsbi * 8 * 4 * sizeof(struct sbus_action)));
+        sbus_actions = kzalloc (nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);
         for_each_sbus(sbus) {
 #ifdef CONFIG_SMP       
                 extern unsigned char boot_cpu_id;
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c
index 2bb1309003d..00706202296 100644
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@@ -41,9 +41,8 @@ iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus)
         struct linux_prom_registers iommu_promregs[PROMREG_MAX];
         struct resource r;
 
-        iounit = kmalloc(sizeof(struct iounit_struct), GFP_ATOMIC);
+        iounit = kzalloc(sizeof(struct iounit_struct), GFP_ATOMIC);
 
-        memset(iounit, 0, sizeof(*iounit));
         iounit->limit[0] = IOUNIT_BMAP1_START;
         iounit->limit[1] = IOUNIT_BMAP2_START;
         iounit->limit[2] = IOUNIT_BMAPM_START;