diff options
author | Panagiotis Issaris <takis@issaris.org> | 2005-11-08 20:08:42 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-11-10 14:28:20 -0500 |
commit | baf47fb66020e5c3fe2386680fa2d79d1f8e0052 (patch) | |
tree | c7d287445373cbdecf22609aa97bd153a6633b36 /arch/ia64 | |
parent | 16e85d1a3182009ff81d71aaf65a2808bd395a6b (diff) |
[IA64] Replace kcalloc(1, with kzalloc.
Conversion from kcalloc(1, to kzalloc.
Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/efi.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/tioce_provider.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index f72ea6aebcb1..a3aa45cbcfa0 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
@@ -987,7 +987,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, | |||
987 | break; | 987 | break; |
988 | } | 988 | } |
989 | 989 | ||
990 | if ((res = kcalloc(1, sizeof(struct resource), GFP_KERNEL)) == NULL) { | 990 | if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) { |
991 | printk(KERN_ERR "failed to alocate resource for iomem\n"); | 991 | printk(KERN_ERR "failed to alocate resource for iomem\n"); |
992 | return; | 992 | return; |
993 | } | 993 | } |
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index b4f5053f5e1b..05e4ea889981 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c | |||
@@ -349,7 +349,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) | |||
349 | return; /*bus # does not exist */ | 349 | return; /*bus # does not exist */ |
350 | prom_bussoft_ptr = __va(prom_bussoft_ptr); | 350 | prom_bussoft_ptr = __va(prom_bussoft_ptr); |
351 | 351 | ||
352 | controller = kcalloc(1,sizeof(struct pci_controller), GFP_KERNEL); | 352 | controller = kzalloc(sizeof(struct pci_controller), GFP_KERNEL); |
353 | controller->segment = segment; | 353 | controller->segment = segment; |
354 | if (!controller) | 354 | if (!controller) |
355 | BUG(); | 355 | BUG(); |
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c index 9f03d4e5121c..dda196c9e324 100644 --- a/arch/ia64/sn/pci/tioce_provider.c +++ b/arch/ia64/sn/pci/tioce_provider.c | |||
@@ -218,7 +218,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port, | |||
218 | if (i > last) | 218 | if (i > last) |
219 | return 0; | 219 | return 0; |
220 | 220 | ||
221 | map = kcalloc(1, sizeof(struct tioce_dmamap), GFP_ATOMIC); | 221 | map = kzalloc(sizeof(struct tioce_dmamap), GFP_ATOMIC); |
222 | if (!map) | 222 | if (!map) |
223 | return 0; | 223 | return 0; |
224 | 224 | ||
@@ -555,7 +555,7 @@ tioce_kern_init(struct tioce_common *tioce_common) | |||
555 | struct tioce *tioce_mmr; | 555 | struct tioce *tioce_mmr; |
556 | struct tioce_kernel *tioce_kern; | 556 | struct tioce_kernel *tioce_kern; |
557 | 557 | ||
558 | tioce_kern = kcalloc(1, sizeof(struct tioce_kernel), GFP_KERNEL); | 558 | tioce_kern = kzalloc(sizeof(struct tioce_kernel), GFP_KERNEL); |
559 | if (!tioce_kern) { | 559 | if (!tioce_kern) { |
560 | return NULL; | 560 | return NULL; |
561 | } | 561 | } |
@@ -727,7 +727,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont | |||
727 | * Allocate kernel bus soft and copy from prom. | 727 | * Allocate kernel bus soft and copy from prom. |
728 | */ | 728 | */ |
729 | 729 | ||
730 | tioce_common = kcalloc(1, sizeof(struct tioce_common), GFP_KERNEL); | 730 | tioce_common = kzalloc(sizeof(struct tioce_common), GFP_KERNEL); |
731 | if (!tioce_common) | 731 | if (!tioce_common) |
732 | return NULL; | 732 | return NULL; |
733 | 733 | ||