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

Commit 656da9da authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[PATCH] PCI: convert kcalloc to kzalloc 



This patch converts kcalloc(1, ...) calls to use the new kzalloc() function.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1029d6b5

drivers/pci/hotplug/sgi_hotplug.c

+3 −3
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot, 


	pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);



	slot = kcalloc(1, sizeof(*slot), GFP_KERNEL);

	slot = kzalloc(sizeof(*slot), GFP_KERNEL);

	if (!slot)

		return -ENOMEM;

	bss_hotplug_slot->private = slot;
@@ -491,7 +491,7 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) 
		if (sn_pci_slot_valid(pci_bus, device) != 1)

			continue;



		bss_hotplug_slot = kcalloc(1, sizeof(*bss_hotplug_slot),

		bss_hotplug_slot = kzalloc(sizeof(*bss_hotplug_slot),

					   GFP_KERNEL);

		if (!bss_hotplug_slot) {

			rc = -ENOMEM;
@@ -499,7 +499,7 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) 
		}



		bss_hotplug_slot->info =

			kcalloc(1, sizeof(struct hotplug_slot_info),

			kzalloc(sizeof(struct hotplug_slot_info),

				GFP_KERNEL);

		if (!bss_hotplug_slot->info) {

			rc = -ENOMEM;

drivers/pci/pci-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ pci_create_resource_files(struct pci_dev *pdev) 
			continue;



		/* allocate attribute structure, piggyback attribute name */

		res_attr = kcalloc(1, sizeof(*res_attr) + 10, GFP_ATOMIC);

		res_attr = kzalloc(sizeof(*res_attr) + 10, GFP_ATOMIC);

		if (res_attr) {

			char *res_attr_name = (char *)(res_attr + 1);