From afc29db1b57f77badf730d1e5ea31cf5baf304ac Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Nov 2007 12:23:18 -0800 Subject: [PATCH] --- yaml --- r: 75831 b: refs/heads/master c: 03d43b19b9f56c1d18bc8f2f7890534fbe6a285d h: refs/heads/master i: 75829: c368c2cb2ce2139b76004b7f114ef64e3a37dc12 75827: a8ce0f01a416e6cf17423f8a4fea469659f9eae5 75823: ee821f6dac463114ad2fe214046f689878021b00 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci-driver.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fc439f5aa0c8..c94f3a65ce62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2344c6de6b6f2a4b07e4416aac9522d23e00d7bc +refs/heads/master: 03d43b19b9f56c1d18bc8f2f7890534fbe6a285d diff --git a/trunk/drivers/pci/pci-driver.c b/trunk/drivers/pci/pci-driver.c index 6d1a21611818..73e362992694 100644 --- a/trunk/drivers/pci/pci-driver.c +++ b/trunk/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); }