lkml.org 
[lkml]   [2008]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 12/16] PCI slot: Use .default_attrs for address file (Not for mainline!)
    Use .default_attrs for 'address' file. This can simplify the code.

    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>

    ---
    drivers/pci/slot.c | 36 +++++++++---------------------------
    1 file changed, 9 insertions(+), 27 deletions(-)

    Index: linux-2.6.25-rc6/drivers/pci/slot.c
    ===================================================================
    --- linux-2.6.25-rc6.orig/drivers/pci/slot.c
    +++ linux-2.6.25-rc6/drivers/pci/slot.c
    @@ -39,25 +39,6 @@ static ssize_t address_read_file(struct
    slot->bus->number, slot->number);
    }

    -static struct pci_slot_attribute pci_slot_attr_address = {
    - .attr = { .name = "address", .mode = S_IFREG | S_IRUGO },
    - .show = address_read_file,
    -};
    -
    -static void remove_sysfs_files(struct pci_slot *slot)
    -{
    - sysfs_remove_file(&slot->kobj, &pci_slot_attr_address.attr);
    -}
    -
    -static int create_sysfs_files(struct pci_slot *slot)
    -{
    - int result;
    -
    - result = sysfs_create_file(&slot->kobj, &pci_slot_attr_address.attr);
    -
    - return result;
    -}
    -
    static void pci_slot_release(struct kobject *kobj)
    {
    struct pci_slot *slot = to_pci_slot(kobj);
    @@ -67,13 +48,21 @@ static void pci_slot_release(struct kobj

    list_del(&slot->list);

    - remove_sysfs_files(slot);
    kfree(slot);
    }

    +static struct pci_slot_attribute pci_slot_attr_address =
    + __ATTR(address, (S_IFREG | S_IRUGO), address_read_file, NULL);
    +
    +static struct attribute *pci_slot_default_attrs[] = {
    + &pci_slot_attr_address.attr,
    + NULL,
    +};
    +
    static struct kobj_type pci_slot_ktype = {
    .sysfs_ops = &pci_slot_sysfs_ops,
    .release = &pci_slot_release,
    + .default_attrs = pci_slot_default_attrs,
    };

    struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
    @@ -114,10 +103,6 @@ struct pci_slot *pci_create_slot(struct
    goto err;
    }

    - err = create_sysfs_files(slot);
    - if (err)
    - goto unregister;
    -
    INIT_LIST_HEAD(&slot->list);
    list_add(&slot->list, &parent->slots);

    @@ -127,9 +112,6 @@ struct pci_slot *pci_create_slot(struct
    out:
    up_write(&pci_bus_sem);
    return slot;
    -
    - unregister:
    - kobject_put(&slot->kobj);
    err:
    kfree(slot);
    slot = ERR_PTR(err);



    \
     
     \ /
      Last update: 2008-03-21 05:23    [W:0.025 / U:29.832 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site