[POWERPC] Move pci_bus_to_hose users to pci_bus_to_host

In the places we can move to using pci_bus_to_host, this allows us
to make pci_bus_to_host static and remove its export.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index df3251ccca0fe5802ebba156fbdcc73ddeb4400e..c81ffa2829772a3f7ca27fc82cc101577fce9848 100644 (file)
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -766,7 +766,7 @@ static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus)
 
        /* Are we a root bus ? */
        if (bus->self == NULL || bus->parent == NULL) {
-               struct pci_controller *hose = pci_bus_to_hose(bus->number);
+               struct pci_controller *hose = pci_bus_to_host(bus);
                if (hose == NULL)
                        return NULL;
                return of_node_get(hose->arch_data);
@@ -1492,7 +1492,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
        return 0;
 }
 
-struct pci_controller*
+static struct pci_controller*
 pci_bus_to_hose(int bus)
 {
        struct pci_controller* hose = hose_head;
@@ -1507,7 +1507,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
                                               resource_size_t *offset,
                                               enum pci_mmap_state mmap_state)
 {
-       struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
+       struct pci_controller *hose = pci_bus_to_host(dev->bus);
        unsigned long io_offset = 0;
        int i, res_bit;
 
@@ -1719,7 +1719,7 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
                          const struct resource *rsrc,
                          resource_size_t *start, resource_size_t *end)
 {
-       struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
+       struct pci_controller *hose = pci_bus_to_host(dev->bus);
        resource_size_t offset = 0;
 
        if (hose == NULL)

diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index c58f2de8f2f6716329e1d224685623f9225a2637..e973c3230ef0b365bed2da6874d91e2e64030a4f 100644 (file)
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -106,7 +106,6 @@ EXPORT_SYMBOL(isa_mem_base);
 EXPORT_SYMBOL(pci_dram_offset);
 EXPORT_SYMBOL(pci_alloc_consistent);
 EXPORT_SYMBOL(pci_free_consistent);
-EXPORT_SYMBOL(pci_bus_to_hose);
 #endif /* CONFIG_PCI */
 
 EXPORT_SYMBOL(start_thread);

diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c
index 5cb2188ee406f39646ba2deabc776c852d8575f6..73cd5b05a84eb49b92270fbeaa71168671fc64fa 100644 (file)
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/platforms/86xx/pci.c
@@ -145,7 +145,7 @@ static void __devinit quirk_fsl_pcie_transparent(struct pci_dev *dev)
         */
        dev->transparent = 1;
 
-       hose = pci_bus_to_hose(dev->bus->number);
+       hose = pci_bus_to_host(dev->bus);
        if (!hose) {
                printk(KERN_ERR "Can't find hose for bus %d\n",
                       dev->bus->number);

diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index d5a9c9f9ade3abef1610dee6dbe748543b5b6c77..69ea865c01a41647b752ee5756a583d5668e0592 100644 (file)
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -9,9 +9,6 @@
 struct device_node;
 struct pci_controller;
 
-/* Get the PCI host controller for a bus */
-extern struct pci_controller* pci_bus_to_hose(int bus);
-
 /*
  * Structure of a PCI controller (host bridge)
  */