lkml.org 
[lkml]   [2005]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 06/18] PCI: convert kcalloc to kzalloc
    From: Pekka Enberg <penberg@cs.helsinki.fi>

    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>


    ---
    drivers/pci/hotplug/sgi_hotplug.c | 6 +++---
    drivers/pci/pci-sysfs.c | 2 +-
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- scsi-2.6.orig/drivers/pci/hotplug/sgi_hotplug.c 2005-09-20 05:59:55.000000000 -0700
    +++ scsi-2.6/drivers/pci/hotplug/sgi_hotplug.c 2005-09-21 17:29:30.000000000 -0700
    @@ -159,7 +159,7 @@

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

    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;
    --- scsi-2.6.orig/drivers/pci/pci-sysfs.c 2005-09-20 05:59:55.000000000 -0700
    +++ scsi-2.6/drivers/pci/pci-sysfs.c 2005-09-21 17:29:30.000000000 -0700
    @@ -360,7 +360,7 @@
    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);

    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-09-22 09:56    [W:0.021 / U:122.916 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site