lkml.org 
[lkml]   [2008]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 143/196] PCI: use proper call to driver_create_file
    Date
    Don't try to call the "raw" sysfs_create_file when we already have a
    helper function to do this kind of work for us.

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/pci/pci-driver.c | 9 +++++++--
    1 files changed, 7 insertions(+), 2 deletions(-)

    diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
    index 6d1a216..73e3629 100644
    --- a/drivers/pci/pci-driver.c
    +++ b/drivers/pci/pci-driver.c
    @@ -96,17 +96,21 @@ pci_create_newid_file(struct pci_driver *drv)
    {
    int error = 0;
    if (drv->probe != NULL)
    - error = sysfs_create_file(&drv->driver.kobj,
    - &driver_attr_new_id.attr);
    + error = driver_create_file(&drv->driver, &driver_attr_new_id);
    return error;
    }

    +static void pci_remove_newid_file(struct pci_driver *drv)
    +{
    + driver_remove_file(&drv->driver, &driver_attr_new_id);
    +}
    #else /* !CONFIG_HOTPLUG */
    static inline void pci_free_dynids(struct pci_driver *drv) {}
    static inline int pci_create_newid_file(struct pci_driver *drv)
    {
    return 0;
    }
    +static inline void pci_remove_newid_file(struct pci_driver *drv) {}
    #endif

    /**
    @@ -447,6 +451,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
    void
    pci_unregister_driver(struct pci_driver *drv)
    {
    + pci_remove_newid_file(drv);
    driver_unregister(&drv->driver);
    pci_free_dynids(drv);
    }
    --
    1.5.3.8


    \
     
     \ /
      Last update: 2008-01-25 09:45    [W:0.023 / U:0.604 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site