aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-28 15:23:18 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:33 -0500
commit03d43b19b9f56c1d18bc8f2f7890534fbe6a285d (patch)
tree28c0edad7b0443a8820ecd144944525f617bfe74 /drivers/pci
parent2344c6de6b6f2a4b07e4416aac9522d23e00d7bc (diff)
PCI: use proper call to driver_create_file
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-driver.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 6d1a21611818..73e362992694 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)
96{ 96{
97 int error = 0; 97 int error = 0;
98 if (drv->probe != NULL) 98 if (drv->probe != NULL)
99 error = sysfs_create_file(&drv->driver.kobj, 99 error = driver_create_file(&drv->driver, &driver_attr_new_id);
100 &driver_attr_new_id.attr);
101 return error; 100 return error;
102} 101}
103 102
103static void pci_remove_newid_file(struct pci_driver *drv)
104{
105 driver_remove_file(&drv->driver, &driver_attr_new_id);
106}
104#else /* !CONFIG_HOTPLUG */ 107#else /* !CONFIG_HOTPLUG */
105static inline void pci_free_dynids(struct pci_driver *drv) {} 108static inline void pci_free_dynids(struct pci_driver *drv) {}
106static inline int pci_create_newid_file(struct pci_driver *drv) 109static inline int pci_create_newid_file(struct pci_driver *drv)
107{ 110{
108 return 0; 111 return 0;
109} 112}
113static inline void pci_remove_newid_file(struct pci_driver *drv) {}
110#endif 114#endif
111 115
112/** 116/**
@@ -447,6 +451,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
447void 451void
448pci_unregister_driver(struct pci_driver *drv) 452pci_unregister_driver(struct pci_driver *drv)
449{ 453{
454 pci_remove_newid_file(drv);
450 driver_unregister(&drv->driver); 455 driver_unregister(&drv->driver);
451 pci_free_dynids(drv); 456 pci_free_dynids(drv);
452} 457}