From 60a25fb81ab6e2b7bac9bee4529c9f18321b27db Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 22 Sep 2005 00:48:11 -0700 Subject: [PATCH] --- yaml --- r: 9195 b: refs/heads/master c: 656da9da3745abcbbbdca598745d04c6de2c8843 h: refs/heads/master i: 9193: 0a2abcdc31b1425516a4b9a50381fb51b15363d7 9191: 6a7313aacdf9b777e572c5fdc9765473adaab466 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/sgi_hotplug.c | 6 +++--- trunk/drivers/pci/pci-sysfs.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3cdb46e86911..fd5533db7bd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1029d6b58adc3225911c56af26895871dd2ea8cf +refs/heads/master: 656da9da3745abcbbbdca598745d04c6de2c8843 diff --git a/trunk/drivers/pci/hotplug/sgi_hotplug.c b/trunk/drivers/pci/hotplug/sgi_hotplug.c index b1409441c1cd..a32ae82e5922 100644 --- a/trunk/drivers/pci/hotplug/sgi_hotplug.c +++ b/trunk/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); - 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; diff --git a/trunk/drivers/pci/pci-sysfs.c b/trunk/drivers/pci/pci-sysfs.c index 56a3b397efee..2898830c496f 100644 --- a/trunk/drivers/pci/pci-sysfs.c +++ b/trunk/drivers/pci/pci-sysfs.c @@ -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);