aboutsummaryrefslogtreecommitdiff
path: root/arch/ppc/platforms
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-06 21:13:32 +0100
committerPaul Mackerras <paulus@samba.org>2006-03-17 13:20:57 +1100
commitd116fe5aeafd8226712d2de9c69428725ca74474 (patch)
tree5c65b1b18d495ac9d16e875a7a4f99863ffe0edb /arch/ppc/platforms
parent0f6be7b77ceaea01a35b37fab26f4ea3b01efe14 (diff)
downloadlinux-linaro-stable-d116fe5aeafd8226712d2de9c69428725ca74474.tar.gz
[PATCH] kzalloc() conversion in arch/ppc
This converts arch/ppc to kzalloc usage. Crosscompile tested with allyesconfig. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms')
-rw-r--r--arch/ppc/platforms/katana.c3
-rw-r--r--arch/ppc/platforms/radstone_ppc7d.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c
index d2766617c3cb..6f3bc6161746 100644
--- a/arch/ppc/platforms/katana.c
+++ b/arch/ppc/platforms/katana.c
@@ -662,12 +662,11 @@ katana_setup_mtd(void)
ptbl_entries = (size >= (64*MB)) ? 6 : 4;
- if ((ptbl = kmalloc(ptbl_entries * sizeof(struct mtd_partition),
+ if ((ptbl = kcalloc(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 = "Monitor";
ptbl[0].size = KATANA_MTD_MONITOR_SIZE;
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 1b1e7c5ef152..30188085bd38 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -683,11 +683,10 @@ ppc7d_fixup_i2c_pdata(struct platform_device *pdev)
pdata = pdev->dev.platform_data;
if (pdata == NULL) {
- pdata = kmalloc(sizeof(*pdata), GFP_KERNEL);
+ pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
if (pdata == NULL)
return;
- memset(pdata, 0, sizeof(*pdata));
pdev->dev.platform_data = pdata;
}