1 files changed, 17 insertions, 35 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 3623d65f8b86..8d9616b821ca 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -72,9 +72,7 @@ int pci_add_dynid(struct pci_driver *drv,
         list_add_tail(&dynid->node, &drv->dynids.list);
         spin_unlock(&drv->dynids.lock);
 
-        get_driver(&drv->driver);
         retval = driver_attach(&drv->driver);
-        put_driver(&drv->driver);
 
         return retval;
 }
@@ -190,43 +188,34 @@ store_remove_id(struct device_driver *driver, const char *buf, size_t count)
 static DRIVER_ATTR(remove_id, S_IWUSR, NULL, store_remove_id);
 
 static int
-pci_create_newid_file(struct pci_driver *drv)
+pci_create_newid_files(struct pci_driver *drv)
 {
         int error = 0;
-        if (drv->probe != NULL)
-                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);
-}
 
-static int
-pci_create_removeid_file(struct pci_driver *drv)
-{
-        int error = 0;
-        if (drv->probe != NULL)
-                error = driver_create_file(&drv->driver,&driver_attr_remove_id);
+        if (drv->probe != NULL) {
+                error = driver_create_file(&drv->driver, &driver_attr_new_id);
+                if (error == 0) {
+                        error = driver_create_file(&drv->driver,
+                                        &driver_attr_remove_id);
+                        if (error)
+                                driver_remove_file(&drv->driver,
+                                                &driver_attr_new_id);
+                }
+        }
         return error;
 }
 
-static void pci_remove_removeid_file(struct pci_driver *drv)
+static void pci_remove_newid_files(struct pci_driver *drv)
 {
         driver_remove_file(&drv->driver, &driver_attr_remove_id);
+        driver_remove_file(&drv->driver, &driver_attr_new_id);
 }
 #else /* !CONFIG_HOTPLUG */
-static inline int pci_create_newid_file(struct pci_driver *drv)
+static inline int pci_create_newid_files(struct pci_driver *drv)
 {
         return 0;
 }
-static inline void pci_remove_newid_file(struct pci_driver *drv) {}
-static inline int pci_create_removeid_file(struct pci_driver *drv)
-{
-        return 0;
-}
-static inline void pci_remove_removeid_file(struct pci_driver *drv) {}
+static inline void pci_remove_newid_files(struct pci_driver *drv) {}
 #endif
 
 /**
@@ -1138,18 +1127,12 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
         if (error)
                 goto out;
 
-        error = pci_create_newid_file(drv);
+        error = pci_create_newid_files(drv);
         if (error)
                 goto out_newid;
-
-        error = pci_create_removeid_file(drv);
-        if (error)
-                goto out_removeid;
 out:
         return error;
 
-out_removeid:
-        pci_remove_newid_file(drv);
 out_newid:
         driver_unregister(&drv->driver);
         goto out;
@@ -1168,8 +1151,7 @@ out_newid:
 void
 pci_unregister_driver(struct pci_driver *drv)
 {
-        pci_remove_removeid_file(drv);
-        pci_remove_newid_file(drv);
+        pci_remove_newid_files(drv);
         driver_unregister(&drv->driver);
         pci_free_dynids(drv);
 }