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 4/7] PCI hotplug: convert skeleton code 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.

    Let's give future implementors a good example to copy from.

    Signed-off-by: Alex Chiang <achiang@hp.com>
    ---
    drivers/pci/hotplug/pcihp_skeleton.c | 11 +++++++++--
    1 files changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c
    index e3dd6cf..3e53026 100644
    --- a/drivers/pci/hotplug/pcihp_skeleton.c
    +++ b/drivers/pci/hotplug/pcihp_skeleton.c
    @@ -41,7 +41,7 @@ struct slot {
    u8 number;
    struct hotplug_slot *hotplug_slot;
    struct list_head slot_list;
    - char name[SLOT_NAME_SIZE];
    + char *name;
    };

    static LIST_HEAD(slot_list);
    @@ -232,6 +232,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
    dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
    kfree(slot->hotplug_slot->info);
    kfree(slot->hotplug_slot);
    + kfree(slot->name);
    kfree(slot);
    }

    @@ -265,9 +266,13 @@ static int __init init_slots(void)
    if (!slot)
    goto error;

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

    info = kzalloc(sizeof(*info), GFP_KERNEL);
    @@ -308,6 +313,8 @@ error_info:
    kfree(info);
    error_hpslot:
    kfree(hotplug_slot);
    +error_name:
    + kfree(slot->name);
    error_slot:
    kfree(slot);
    error:
    --
    1.6.0.rc0.g95f8


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