Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baf47fb6 authored by Panagiotis Issaris's avatar Panagiotis Issaris Committed by Tony Luck
Browse files

[IA64] Replace kcalloc(1, with kzalloc. 



Conversion from kcalloc(1, to kzalloc.

Signed-off-by: default avatarPanagiotis Issaris <takis@issaris.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 16e85d1a

arch/ia64/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

arch/ia64/sn/kernel/io_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

arch/ia64/sn/pci/tioce_provider.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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;

	}
@@ -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;