diff options
author | Burman Yan <yan_952@hotmail.com> | 2006-12-06 20:14:19 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:19 -0500 |
commit | 116780fc04d9f6cd3ceeab0251681f1dfda53367 (patch) | |
tree | d28148b520fa9ed8e7ea7d6e067c95cee4a42078 /arch/i386/mach-voyager | |
parent | d7fb02712818643bab79a6b3cb8270a747d0227b (diff) |
[PATCH] i386: replace kmalloc+memset with kzalloc
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/mach-voyager')
-rw-r--r-- | arch/i386/mach-voyager/voyager_cat.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c index f50c6c6ad680..943a9473b138 100644 --- a/arch/i386/mach-voyager/voyager_cat.c +++ b/arch/i386/mach-voyager/voyager_cat.c | |||
@@ -776,7 +776,7 @@ voyager_cat_init(void) | |||
776 | for(asic=0; asic < (*modpp)->num_asics; asic++) { | 776 | for(asic=0; asic < (*modpp)->num_asics; asic++) { |
777 | int j; | 777 | int j; |
778 | voyager_asic_t *asicp = *asicpp | 778 | voyager_asic_t *asicp = *asicpp |
779 | = kmalloc(sizeof(voyager_asic_t), GFP_KERNEL); /*&voyager_asic_storage[asic_count++];*/ | 779 | = kzalloc(sizeof(voyager_asic_t), GFP_KERNEL); /*&voyager_asic_storage[asic_count++];*/ |
780 | voyager_sp_table_t *sp_table; | 780 | voyager_sp_table_t *sp_table; |
781 | voyager_at_t *asic_table; | 781 | voyager_at_t *asic_table; |
782 | voyager_jtt_t *jtag_table; | 782 | voyager_jtt_t *jtag_table; |
@@ -785,7 +785,6 @@ voyager_cat_init(void) | |||
785 | printk("**WARNING** kmalloc failure in cat_init\n"); | 785 | printk("**WARNING** kmalloc failure in cat_init\n"); |
786 | continue; | 786 | continue; |
787 | } | 787 | } |
788 | memset(asicp, 0, sizeof(voyager_asic_t)); | ||
789 | asicpp = &(asicp->next); | 788 | asicpp = &(asicp->next); |
790 | asicp->asic_location = asic; | 789 | asicp->asic_location = asic; |
791 | sp_table = (voyager_sp_table_t *)(eprom_buf + sp_offset); | 790 | sp_table = (voyager_sp_table_t *)(eprom_buf + sp_offset); |
@@ -851,8 +850,7 @@ voyager_cat_init(void) | |||
851 | #endif | 850 | #endif |
852 | 851 | ||
853 | { | 852 | { |
854 | struct resource *res = kmalloc(sizeof(struct resource),GFP_KERNEL); | 853 | struct resource *res = kzalloc(sizeof(struct resource),GFP_KERNEL); |
855 | memset(res, 0, sizeof(struct resource)); | ||
856 | res->name = kmalloc(128, GFP_KERNEL); | 854 | res->name = kmalloc(128, GFP_KERNEL); |
857 | sprintf((char *)res->name, "Voyager %s Quad CPI", cat_module_name(i)); | 855 | sprintf((char *)res->name, "Voyager %s Quad CPI", cat_module_name(i)); |
858 | res->start = qic_addr; | 856 | res->start = qic_addr; |