Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 5ef19b1..99ffbd4 100644 (file)
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -2,20 +2,13 @@
 #include <linux/module.h>
 #include "pci.h"
 
-#undef DEBUG
-
-#ifdef DEBUG
-#define DBG(x...) printk(x)
-#else
-#define DBG(x...)
-#endif
-
 static void pci_free_resources(struct pci_dev *dev)
 {
        int i;
 
        msi_remove_pci_irq_vectors(dev);
 
+       pci_cleanup_rom(dev);
        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
                struct resource *res = dev->resource + i;
                if (res->parent)
@@ -25,17 +18,22 @@ static void pci_free_resources(struct pci_dev *dev)
 
 static void pci_destroy_dev(struct pci_dev *dev)
 {
-       pci_proc_detach_device(dev);
-       device_unregister(&dev->dev);
+       if (!list_empty(&dev->global_list)) {
+               pci_proc_detach_device(dev);
+               pci_remove_sysfs_dev_files(dev);
+               device_unregister(&dev->dev);
+               down_write(&pci_bus_sem);
+               list_del(&dev->global_list);
+               dev->global_list.next = dev->global_list.prev = NULL;
+               up_write(&pci_bus_sem);
+       }
 
        /* 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);
-       list_del(&dev->global_list);
        dev->bus_list.next = dev->bus_list.prev = NULL;
-       dev->global_list.next = dev->global_list.prev = NULL;
-       spin_unlock(&pci_bus_lock);
+       up_write(&pci_bus_sem);
 
        pci_free_resources(dev);
        pci_dev_put(dev);
@@ -50,6 +48,7 @@ static void pci_destroy_dev(struct pci_dev *dev)
  * in question is not being used by a driver.
  * Returns 0 on success.
  */
+#if 0
 int pci_remove_device_safe(struct pci_dev *dev)
 {
        if (pci_dev_driver(dev))
@@ -57,7 +56,22 @@ int pci_remove_device_safe(struct pci_dev *dev)
        pci_destroy_dev(dev);
        return 0;
 }
-EXPORT_SYMBOL(pci_remove_device_safe);
+#endif  /*  0  */
+
+void pci_remove_bus(struct pci_bus *pci_bus)
+{
+       pci_proc_detach_bus(pci_bus);
+
+       down_write(&pci_bus_sem);
+       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);
+}
+EXPORT_SYMBOL(pci_remove_bus);
 
 /**
  * pci_remove_bus_device - remove a PCI device and any children
@@ -77,13 +91,7 @@ void pci_remove_bus_device(struct pci_dev *dev)
                struct pci_bus *b = dev->subordinate;
 
                pci_remove_behind_bridge(dev);
-               pci_proc_detach_bus(b);
-
-               spin_lock(&pci_bus_lock);
-               list_del(&b->node);
-               spin_unlock(&pci_bus_lock);
-
-               class_device_unregister(&b->class_dev);
+               pci_remove_bus(b);
                dev->subordinate = NULL;
        }