PCI: remove global list of PCI devices

This patch finally removes the global list of PCI devices.  We are
relying entirely on the list held in the driver core now, and do not
need a separate "shadow" list as no one uses it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 1 insertions, 46 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index e1c079aa0e82..529d9d7727b0 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -85,10 +85,6 @@ int pci_bus_add_device(struct pci_dev *dev)
                 return retval;
 
         dev->is_added = 1;
-        down_write(&pci_bus_sem);
-        list_add_tail(&dev->global_list, &pci_devices);
-        up_write(&pci_bus_sem);
-
         pci_proc_attach_device(dev);
         pci_create_sysfs_dev_files(dev);
         return 0;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 7217f4283ce8..504f19b2af45 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -20,8 +20,6 @@
 LIST_HEAD(pci_root_buses);
 EXPORT_SYMBOL(pci_root_buses);
 
-LIST_HEAD(pci_devices);
-
 
 static int find_anything(struct device *dev, void *data)
 {
@@ -860,7 +858,6 @@ struct pci_dev *alloc_pci_dev(void)
         if (!dev)
                 return NULL;
 
-        INIT_LIST_HEAD(&dev->global_list);
         INIT_LIST_HEAD(&dev->bus_list);
 
         pci_msi_init_pci_dev(dev);
@@ -957,7 +954,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
          * Add the device to our list of discovered devices
          * and the bus list for fixup functions, etc.
          */
-        INIT_LIST_HEAD(&dev->global_list);
         down_write(&pci_bus_sem);
         list_add_tail(&dev->bus_list, &bus->devices);
         up_write(&pci_bus_sem);
@@ -1186,7 +1182,7 @@ static void __init pci_insertion_sort_klist(struct pci_dev *a, struct list_head
         list_move_tail(&a->dev.knode_bus.n_node, list);
 }
 
-static void __init pci_sort_breadthfirst_klist(void)
+void __init pci_sort_breadthfirst(void)
 {
         LIST_HEAD(sorted_devices);
         struct list_head *pos, *tmp;
@@ -1207,36 +1203,3 @@ static void __init pci_sort_breadthfirst_klist(void)
         list_splice(&sorted_devices, &device_klist->k_list);
         spin_unlock(&device_klist->k_lock);
 }
-
-static void __init pci_insertion_sort_devices(struct pci_dev *a, struct list_head *list)
-{
-        struct pci_dev *b;
-
-        list_for_each_entry(b, list, global_list) {
-                if (pci_sort_bf_cmp(a, b) <= 0) {
-                        list_move_tail(&a->global_list, &b->global_list);
-                        return;
-                }
-        }
-        list_move_tail(&a->global_list, list);
-}
-
-static void __init pci_sort_breadthfirst_devices(void)
-{
-        LIST_HEAD(sorted_devices);
-        struct pci_dev *dev, *tmp;
-
-        down_write(&pci_bus_sem);
-        list_for_each_entry_safe(dev, tmp, &pci_devices, global_list) {
-                pci_insertion_sort_devices(dev, &sorted_devices);
-        }
-        list_splice(&sorted_devices, &pci_devices);
-        up_write(&pci_bus_sem);
-}
-
-void __init pci_sort_breadthfirst(void)
-{
-        pci_sort_breadthfirst_devices();
-        pci_sort_breadthfirst_klist();
-}
-
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index d3c77cbe3279..b6824833343f 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -23,10 +23,6 @@ static void pci_stop_dev(struct pci_dev *dev)
                 pci_remove_sysfs_dev_files(dev);
                 device_unregister(&dev->dev);
                 dev->is_added = 0;
-                down_write(&pci_bus_sem);
-                list_del(&dev->global_list);
-                dev->global_list.next = dev->global_list.prev = NULL;
-                up_write(&pci_bus_sem);
         }
 }