x86/PCI: Remove unused pci_root_bus

pci_root_bus is unused, so remove all references to it.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index 73e8eeff22ee038784b9a88841ba659250f9a18c..0126f104f0a56695858297ba6624b56809b1f286 100644 (file)
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -54,7 +54,6 @@ void pcibios_set_cache_line_size(void);
 /* pci-pc.c */
 
 extern int pcibios_last_bus;
-extern struct pci_bus *pci_root_bus;
 extern struct pci_ops pci_root_ops;
 
 void pcibios_scan_specific_bus(int busn);

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 412e1286d1fccc08383f18d4912da7087c581322..505731b139f4ca159495a8e4d2beea768342627e 100644 (file)
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -34,7 +34,6 @@ int noioapicreroute = 1;
 #endif
 int pcibios_last_bus = -1;
 unsigned long pirq_table_addr;
-struct pci_bus *pci_root_bus;
 const struct pci_raw_ops *__read_mostly raw_pci_ops;
 const struct pci_raw_ops *__read_mostly raw_pci_ext_ops;
 

diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index a1df191129d30154e3386dc46ba78e5b540bbb74..a9e83083fb85cc989f0336bed5012d7beb032ee2 100644 (file)
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -30,7 +30,7 @@ int __init pci_legacy_init(void)
        }
 
        printk("PCI: Probing PCI hardware\n");
-       pci_root_bus = pcibios_scan_root(0);
+       pcibios_scan_root(0);
        return 0;
 }
 

diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c
index 83e125b95ca6d6502c9b6d12babbe5ea77a464d4..00edfe652b72b3743728f100f6ef91c3e13079e4 100644 (file)
--- a/arch/x86/pci/numaq_32.c
+++ b/arch/x86/pci/numaq_32.c
@@ -152,7 +152,7 @@ int __init pci_numaq_init(void)
 
        raw_pci_ops = &pci_direct_conf1_mq;
 
-       pci_root_bus = pcibios_scan_root(0);
+       pcibios_scan_root(0);
        if (num_online_nodes() > 1)
                for_each_online_node(quad) {
                        if (quad == 0)