lkml.org 
[lkml]   [2008]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/7] acpiphp: convert to a kmalloc'ed slot name

    Callers of pci_hp_register() need to be converted from a
    char name[] to a char *name.

    This change allows pci_create_slot() to dynamically rename the
    sysfs name of the slot in the event of a name collision.

    Signed-off-by: Alex Chiang <achiang@hp.com>
    ---
    drivers/pci/hotplug/acpiphp.h | 2 +-
    drivers/pci/hotplug/acpiphp_core.c | 17 ++++++++++-------
    2 files changed, 11 insertions(+), 8 deletions(-)

    diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
    index 5a58b07..2ac519d 100644
    --- a/drivers/pci/hotplug/acpiphp.h
    +++ b/drivers/pci/hotplug/acpiphp.h
    @@ -63,7 +63,7 @@ struct slot {
    struct hotplug_slot *hotplug_slot;
    struct acpiphp_slot *acpi_slot;
    struct hotplug_slot_info info;
    - char name[SLOT_NAME_SIZE];
    + char *name;
    };

    /*
    diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
    index 0e496e8..ec164f4 100644
    --- a/drivers/pci/hotplug/acpiphp_core.c
    +++ b/drivers/pci/hotplug/acpiphp_core.c
    @@ -301,6 +301,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)

    dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

    + kfree(slot->name);
    kfree(slot->hotplug_slot);
    kfree(slot);
    }
    @@ -315,9 +316,13 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot)
    if (!slot)
    goto error;

    + slot->name = kzalloc(SLOT_NAME_SIZE, GFP_KERNEL);
    + if (!slot->name)
    + goto error_slot;
    +
    slot->hotplug_slot = kzalloc(sizeof(*slot->hotplug_slot), GFP_KERNEL);
    if (!slot->hotplug_slot)
    - goto error_slot;
    + goto error_name;

    slot->hotplug_slot->info = &slot->info;

    @@ -336,23 +341,21 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot)
    slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN;

    acpiphp_slot->slot = slot;
    - snprintf(slot->name, sizeof(slot->name), "%u", slot->acpi_slot->sun);
    + snprintf(slot->name, SLOT_NAME_SIZE, "%u", slot->acpi_slot->sun);

    retval = pci_hp_register(slot->hotplug_slot,
    acpiphp_slot->bridge->pci_bus,
    acpiphp_slot->device);
    - if (retval == -EBUSY)
    - goto error_hpslot;
    - if (retval) {
    - err("pci_hp_register failed with error %d\n", retval);
    + if (retval)
    goto error_hpslot;
    - }

    info("Slot [%s] registered\n", slot->hotplug_slot->name);

    return 0;
    error_hpslot:
    kfree(slot->hotplug_slot);
    +error_name:
    + kfree(slot->name);
    error_slot:
    kfree(slot);
    error:
    --
    1.6.0.rc0.g95f8


    \
     
     \ /
      Last update: 2008-08-06 07:13    [W:0.023 / U:4.748 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site