Skip to content

Commit

Permalink
[IA64] Replace kcalloc(1, with kzalloc.
Browse files Browse the repository at this point in the history
Conversion from kcalloc(1, to kzalloc.

Signed-off-by: Panagiotis Issaris <[email protected]>
Signed-off-by: Tony Luck <[email protected]>
  • Loading branch information
takis authored and aegl committed Nov 10, 2005
1 parent 16e85d1 commit baf47fb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/ia64/kernel/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ efi_initialize_iomem_resources(struct resource *code_resource,
break;
}

if ((res = kcalloc(1, sizeof(struct resource), GFP_KERNEL)) == NULL) {
if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {
printk(KERN_ERR "failed to alocate resource for iomem\n");
return;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/sn/kernel/io_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
return; /*bus # does not exist */
prom_bussoft_ptr = __va(prom_bussoft_ptr);

controller = kcalloc(1,sizeof(struct pci_controller), GFP_KERNEL);
controller = kzalloc(sizeof(struct pci_controller), GFP_KERNEL);
controller->segment = segment;
if (!controller)
BUG();
Expand Down
6 changes: 3 additions & 3 deletions arch/ia64/sn/pci/tioce_provider.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,
if (i > last)
return 0;

map = kcalloc(1, sizeof(struct tioce_dmamap), GFP_ATOMIC);
map = kzalloc(sizeof(struct tioce_dmamap), GFP_ATOMIC);
if (!map)
return 0;

Expand Down Expand Up @@ -555,7 +555,7 @@ tioce_kern_init(struct tioce_common *tioce_common)
struct tioce *tioce_mmr;
struct tioce_kernel *tioce_kern;

tioce_kern = kcalloc(1, sizeof(struct tioce_kernel), GFP_KERNEL);
tioce_kern = kzalloc(sizeof(struct tioce_kernel), GFP_KERNEL);
if (!tioce_kern) {
return NULL;
}
Expand Down Expand Up @@ -727,7 +727,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
* Allocate kernel bus soft and copy from prom.
*/

tioce_common = kcalloc(1, sizeof(struct tioce_common), GFP_KERNEL);
tioce_common = kzalloc(sizeof(struct tioce_common), GFP_KERNEL);
if (!tioce_common)
return NULL;

Expand Down

0 comments on commit baf47fb

Please sign in to comment.