aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan Burman <burman.yan@gmail.com>2006-12-06 23:34:51 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:29 -0500
commit8bcbdf603bc4bf24c2bcfa071871afb03dd3ae80 (patch)
tree234d6f79b5a94170be722d32b22cfef149d93231
parent58e14b148ddb56f0bf999965d6279932ed4a00bc (diff)
[PATCH] m68k: replace kmalloc+memset with kzalloc
Replace kmalloc+memset with kzalloc Signed-off-by: Yan Burman <burman.yan@gmail.com> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/m68k/amiga/chipram.c3
-rw-r--r--arch/m68k/atari/hades-pci.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index de1304c91112..fa015d801617 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -52,10 +52,9 @@ void *amiga_chip_alloc(unsigned long size, const char *name)
52#ifdef DEBUG 52#ifdef DEBUG
53 printk("amiga_chip_alloc: allocate %ld bytes\n", size); 53 printk("amiga_chip_alloc: allocate %ld bytes\n", size);
54#endif 54#endif
55 res = kmalloc(sizeof(struct resource), GFP_KERNEL); 55 res = kzalloc(sizeof(struct resource), GFP_KERNEL);
56 if (!res) 56 if (!res)
57 return NULL; 57 return NULL;
58 memset(res, 0, sizeof(struct resource));
59 res->name = name; 58 res->name = name;
60 59
61 if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) { 60 if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
diff --git a/arch/m68k/atari/hades-pci.c b/arch/m68k/atari/hades-pci.c
index 6ca57b6564da..bee2b1443e36 100644
--- a/arch/m68k/atari/hades-pci.c
+++ b/arch/m68k/atari/hades-pci.c
@@ -375,10 +375,9 @@ struct pci_bus_info * __init init_hades_pci(void)
375 * Allocate memory for bus info structure. 375 * Allocate memory for bus info structure.
376 */ 376 */
377 377
378 bus = kmalloc(sizeof(struct pci_bus_info), GFP_KERNEL); 378 bus = kzalloc(sizeof(struct pci_bus_info), GFP_KERNEL);
379 if (!bus) 379 if (!bus)
380 return NULL; 380 return NULL;
381 memset(bus, 0, sizeof(struct pci_bus_info));
382 381
383 /* 382 /*
384 * Claim resources. The m68k has no separate I/O space, both 383 * Claim resources. The m68k has no separate I/O space, both