Browse Source

[PATCH] PCI: convert kcalloc to kzalloc

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

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pekka Enberg 19 years ago
parent
commit
656da9da37
2 changed files with 4 additions and 4 deletions
  1. 3 3
      drivers/pci/hotplug/sgi_hotplug.c
  2. 1 1
      drivers/pci/pci-sysfs.c

+ 3 - 3
drivers/pci/hotplug/sgi_hotplug.c

@@ -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);
 	pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);
 
 
-	slot = kcalloc(1, sizeof(*slot), GFP_KERNEL);
+	slot = kzalloc(sizeof(*slot), GFP_KERNEL);
 	if (!slot)
 	if (!slot)
 		return -ENOMEM;
 		return -ENOMEM;
 	bss_hotplug_slot->private = slot;
 	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)
 		if (sn_pci_slot_valid(pci_bus, device) != 1)
 			continue;
 			continue;
 
 
-		bss_hotplug_slot = kcalloc(1, sizeof(*bss_hotplug_slot),
+		bss_hotplug_slot = kzalloc(sizeof(*bss_hotplug_slot),
 					   GFP_KERNEL);
 					   GFP_KERNEL);
 		if (!bss_hotplug_slot) {
 		if (!bss_hotplug_slot) {
 			rc = -ENOMEM;
 			rc = -ENOMEM;
@@ -499,7 +499,7 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus)
 		}
 		}
 
 
 		bss_hotplug_slot->info =
 		bss_hotplug_slot->info =
-			kcalloc(1, sizeof(struct hotplug_slot_info),
+			kzalloc(sizeof(struct hotplug_slot_info),
 				GFP_KERNEL);
 				GFP_KERNEL);
 		if (!bss_hotplug_slot->info) {
 		if (!bss_hotplug_slot->info) {
 			rc = -ENOMEM;
 			rc = -ENOMEM;

+ 1 - 1
drivers/pci/pci-sysfs.c

@@ -360,7 +360,7 @@ pci_create_resource_files(struct pci_dev *pdev)
 			continue;
 			continue;
 
 
 		/* allocate attribute structure, piggyback attribute name */
 		/* 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) {
 		if (res_attr) {
 			char *res_attr_name = (char *)(res_attr + 1);
 			char *res_attr_name = (char *)(res_attr + 1);