1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 430281b2e921..ec4a82ba29a8 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -1,5 +1,6 @@
 #include <linux/pci.h>
 #include <linux/module.h>
+#include <linux/aspm.h>
 #include "pci.h"
 
 static void pci_free_resources(struct pci_dev *dev)
@@ -30,6 +31,9 @@ static void pci_stop_dev(struct pci_dev *dev)
                 dev->global_list.next = dev->global_list.prev = NULL;
                 up_write(&pci_bus_sem);
         }
+
+        if (dev->bus->self)
+                pcie_aspm_exit_link_state(dev);
 }
 
 static void pci_destroy_dev(struct pci_dev *dev)
@@ -74,10 +78,8 @@ void pci_remove_bus(struct pci_bus *pci_bus)
         list_del(&pci_bus->node);
         up_write(&pci_bus_sem);
         pci_remove_legacy_files(pci_bus);
-        class_device_remove_file(&pci_bus->class_dev,
-                &class_device_attr_cpuaffinity);
-        sysfs_remove_link(&pci_bus->class_dev.kobj, "bridge");
-        class_device_unregister(&pci_bus->class_dev);
+        device_remove_file(&pci_bus->dev, &dev_attr_cpuaffinity);
+        device_unregister(&pci_bus->dev);
 }
 EXPORT_SYMBOL(pci_remove_bus);