Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[linux-3.10.git] / drivers / pci / remove.c
index c01baca..cc875e6 100644 (file)
@@ -19,10 +19,12 @@ static void pci_free_resources(struct pci_dev *dev)
 
 static void pci_stop_dev(struct pci_dev *dev)
 {
+       pci_pme_active(dev, false);
+
        if (dev->is_added) {
                pci_proc_detach_device(dev);
                pci_remove_sysfs_dev_files(dev);
-               device_unregister(&dev->dev);
+               device_del(&dev->dev);
                dev->is_added = 0;
        }
 
@@ -32,15 +34,12 @@ static void pci_stop_dev(struct pci_dev *dev)
 
 static void pci_destroy_dev(struct pci_dev *dev)
 {
-       /* Remove the device from the device lists, and prevent any further
-        * list accesses from this device */
        down_write(&pci_bus_sem);
        list_del(&dev->bus_list);
-       dev->bus_list.next = dev->bus_list.prev = NULL;
        up_write(&pci_bus_sem);
 
        pci_free_resources(dev);
-       pci_dev_put(dev);
+       put_device(&dev->dev);
 }
 
 void pci_remove_bus(struct pci_bus *bus)
@@ -59,25 +58,13 @@ void pci_remove_bus(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pci_remove_bus);
 
-/**
- * pci_stop_and_remove_bus_device - remove a PCI device and any children
- * @dev: the device to remove
- *
- * Remove a PCI device from the device lists, informing the drivers
- * that the device has been removed.  We also remove any subordinate
- * buses and children in a depth-first manner.
- *
- * For each device we remove, delete the device structure from the
- * device lists, remove the /proc entry, and notify userspace
- * (/sbin/hotplug).
- */
-void pci_stop_and_remove_bus_device(struct pci_dev *dev)
+static void pci_stop_bus_device(struct pci_dev *dev)
 {
        struct pci_bus *bus = dev->subordinate;
        struct pci_dev *child, *tmp;
 
        /*
-        * Removing an SR-IOV PF device removes all the associated VFs,
+        * Stopping an SR-IOV PF device removes all the associated VFs,
         * which will update the bus->devices list and confuse the
         * iterator.  Therefore, iterate in reverse so we remove the VFs
         * first, then the PF.
@@ -85,13 +72,80 @@ void pci_stop_and_remove_bus_device(struct pci_dev *dev)
        if (bus) {
                list_for_each_entry_safe_reverse(child, tmp,
                                                 &bus->devices, bus_list)
-                       pci_stop_and_remove_bus_device(child);
+                       pci_stop_bus_device(child);
+       }
+
+       pci_stop_dev(dev);
+}
+
+static void pci_remove_bus_device(struct pci_dev *dev)
+{
+       struct pci_bus *bus = dev->subordinate;
+       struct pci_dev *child, *tmp;
+
+       if (bus) {
+               list_for_each_entry_safe(child, tmp,
+                                        &bus->devices, bus_list)
+                       pci_remove_bus_device(child);
 
                pci_remove_bus(bus);
                dev->subordinate = NULL;
        }
 
-       pci_stop_dev(dev);
        pci_destroy_dev(dev);
 }
+
+/**
+ * pci_stop_and_remove_bus_device - remove a PCI device and any children
+ * @dev: the device to remove
+ *
+ * Remove a PCI device from the device lists, informing the drivers
+ * that the device has been removed.  We also remove any subordinate
+ * buses and children in a depth-first manner.
+ *
+ * For each device we remove, delete the device structure from the
+ * device lists, remove the /proc entry, and notify userspace
+ * (/sbin/hotplug).
+ */
+void pci_stop_and_remove_bus_device(struct pci_dev *dev)
+{
+       pci_stop_bus_device(dev);
+       pci_remove_bus_device(dev);
+}
 EXPORT_SYMBOL(pci_stop_and_remove_bus_device);
+
+void pci_stop_root_bus(struct pci_bus *bus)
+{
+       struct pci_dev *child, *tmp;
+       struct pci_host_bridge *host_bridge;
+
+       if (!pci_is_root_bus(bus))
+               return;
+
+       host_bridge = to_pci_host_bridge(bus->bridge);
+       list_for_each_entry_safe_reverse(child, tmp,
+                                        &bus->devices, bus_list)
+               pci_stop_bus_device(child);
+
+       /* stop the host bridge */
+       device_del(&host_bridge->dev);
+}
+
+void pci_remove_root_bus(struct pci_bus *bus)
+{
+       struct pci_dev *child, *tmp;
+       struct pci_host_bridge *host_bridge;
+
+       if (!pci_is_root_bus(bus))
+               return;
+
+       host_bridge = to_pci_host_bridge(bus->bridge);
+       list_for_each_entry_safe(child, tmp,
+                                &bus->devices, bus_list)
+               pci_remove_bus_device(child);
+       pci_remove_bus(bus);
+       host_bridge->bus = NULL;
+
+       /* remove the host bridge */
+       put_device(&host_bridge->dev);
+}