diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-06 15:13:32 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-16 21:20:57 -0500 |
commit | d116fe5aeafd8226712d2de9c69428725ca74474 (patch) | |
tree | 5c65b1b18d495ac9d16e875a7a4f99863ffe0edb /arch/ppc/platforms | |
parent | 0f6be7b77ceaea01a35b37fab26f4ea3b01efe14 (diff) |
[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.c | 3 | ||||
-rw-r--r-- | arch/ppc/platforms/radstone_ppc7d.c | 3 |
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) | |||
662 | 662 | ||
663 | ptbl_entries = (size >= (64*MB)) ? 6 : 4; | 663 | ptbl_entries = (size >= (64*MB)) ? 6 : 4; |
664 | 664 | ||
665 | if ((ptbl = kmalloc(ptbl_entries * sizeof(struct mtd_partition), | 665 | if ((ptbl = kcalloc(ptbl_entries, sizeof(struct mtd_partition), |
666 | GFP_KERNEL)) == NULL) { | 666 | GFP_KERNEL)) == NULL) { |
667 | printk(KERN_WARNING "Can't alloc MTD partition table\n"); | 667 | printk(KERN_WARNING "Can't alloc MTD partition table\n"); |
668 | return -ENOMEM; | 668 | return -ENOMEM; |
669 | } | 669 | } |
670 | memset(ptbl, 0, ptbl_entries * sizeof(struct mtd_partition)); | ||
671 | 670 | ||
672 | ptbl[0].name = "Monitor"; | 671 | ptbl[0].name = "Monitor"; |
673 | ptbl[0].size = KATANA_MTD_MONITOR_SIZE; | 672 | 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) | |||
683 | 683 | ||
684 | pdata = pdev->dev.platform_data; | 684 | pdata = pdev->dev.platform_data; |
685 | if (pdata == NULL) { | 685 | if (pdata == NULL) { |
686 | pdata = kmalloc(sizeof(*pdata), GFP_KERNEL); | 686 | pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); |
687 | if (pdata == NULL) | 687 | if (pdata == NULL) |
688 | return; | 688 | return; |
689 | 689 | ||
690 | memset(pdata, 0, sizeof(*pdata)); | ||
691 | pdev->dev.platform_data = pdata; | 690 | pdev->dev.platform_data = pdata; |
692 | } | 691 | } |
693 | 692 | ||