Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / pci / remove.c

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 1a6bf9de166fa343ff6123e10b9aecc54b106590..9684e1bde277a1e012fae641363178f394071323 100644 (file)
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -16,24 +16,32 @@ static void pci_free_resources(struct pci_dev *dev)
        }
 }
 
-static void pci_destroy_dev(struct pci_dev *dev)
+static void pci_stop_dev(struct pci_dev *dev)
 {
+       if (!dev->global_list.next)
+               return;
+
        if (!list_empty(&dev->global_list)) {
                pci_proc_detach_device(dev);
                pci_remove_sysfs_dev_files(dev);
                device_unregister(&dev->dev);
-               spin_lock(&pci_bus_lock);
+               down_write(&pci_bus_sem);
                list_del(&dev->global_list);
                dev->global_list.next = dev->global_list.prev = NULL;
-               spin_unlock(&pci_bus_lock);
+               up_write(&pci_bus_sem);
        }
+}
+
+static void pci_destroy_dev(struct pci_dev *dev)
+{
+       pci_stop_dev(dev);
 
        /* Remove the device from the device lists, and prevent any further
         * list accesses from this device */
-       spin_lock(&pci_bus_lock);
+       down_write(&pci_bus_sem);
        list_del(&dev->bus_list);
        dev->bus_list.next = dev->bus_list.prev = NULL;
-       spin_unlock(&pci_bus_lock);
+       up_write(&pci_bus_sem);
 
        pci_free_resources(dev);
        pci_dev_put(dev);
@@ -62,14 +70,12 @@ void pci_remove_bus(struct pci_bus *pci_bus)
 {
        pci_proc_detach_bus(pci_bus);
 
-       spin_lock(&pci_bus_lock);
+       down_write(&pci_bus_sem);
        list_del(&pci_bus->node);
-       spin_unlock(&pci_bus_lock);
+       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);
 
@@ -119,5 +125,32 @@ void pci_remove_behind_bridge(struct pci_dev *dev)
        }
 }
 
+static void pci_stop_bus_devices(struct pci_bus *bus)
+{
+       struct list_head *l, *n;
+
+       list_for_each_safe(l, n, &bus->devices) {
+               struct pci_dev *dev = pci_dev_b(l);
+               pci_stop_bus_device(dev);
+       }
+}
+
+/**
+ * pci_stop_bus_device - stop a PCI device and any children
+ * @dev: the device to stop
+ *
+ * Stop a PCI device (detach the driver, remove from the global list
+ * and so on). This also stop any subordinate buses and children in a
+ * depth-first manner.
+ */
+void pci_stop_bus_device(struct pci_dev *dev)
+{
+       if (dev->subordinate)
+               pci_stop_bus_devices(dev->subordinate);
+
+       pci_stop_dev(dev);
+}
+
 EXPORT_SYMBOL(pci_remove_bus_device);
 EXPORT_SYMBOL(pci_remove_behind_bridge);
+EXPORT_SYMBOL_GPL(pci_stop_bus_device);