aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/pci_32.c8
-rw-r--r--arch/powerpc/kernel/ppc_ksyms.c1
-rw-r--r--arch/powerpc/platforms/86xx/pci.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index df3251ccca0f..c81ffa282977 100644
--- 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)
766 766
767 /* Are we a root bus ? */ 767 /* Are we a root bus ? */
768 if (bus->self == NULL || bus->parent == NULL) { 768 if (bus->self == NULL || bus->parent == NULL) {
769 struct pci_controller *hose = pci_bus_to_hose(bus->number); 769 struct pci_controller *hose = pci_bus_to_host(bus);
770 if (hose == NULL) 770 if (hose == NULL)
771 return NULL; 771 return NULL;
772 return of_node_get(hose->arch_data); 772 return of_node_get(hose->arch_data);
@@ -1492,7 +1492,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
1492 return 0; 1492 return 0;
1493} 1493}
1494 1494
1495struct pci_controller* 1495static struct pci_controller*
1496pci_bus_to_hose(int bus) 1496pci_bus_to_hose(int bus)
1497{ 1497{
1498 struct pci_controller* hose = hose_head; 1498 struct pci_controller* hose = hose_head;
@@ -1507,7 +1507,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
1507 resource_size_t *offset, 1507 resource_size_t *offset,
1508 enum pci_mmap_state mmap_state) 1508 enum pci_mmap_state mmap_state)
1509{ 1509{
1510 struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); 1510 struct pci_controller *hose = pci_bus_to_host(dev->bus);
1511 unsigned long io_offset = 0; 1511 unsigned long io_offset = 0;
1512 int i, res_bit; 1512 int i, res_bit;
1513 1513
@@ -1719,7 +1719,7 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
1719 const struct resource *rsrc, 1719 const struct resource *rsrc,
1720 resource_size_t *start, resource_size_t *end) 1720 resource_size_t *start, resource_size_t *end)
1721{ 1721{
1722 struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); 1722 struct pci_controller *hose = pci_bus_to_host(dev->bus);
1723 resource_size_t offset = 0; 1723 resource_size_t offset = 0;
1724 1724
1725 if (hose == NULL) 1725 if (hose == NULL)
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index c58f2de8f2f6..e973c3230ef0 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -106,7 +106,6 @@ EXPORT_SYMBOL(isa_mem_base);
106EXPORT_SYMBOL(pci_dram_offset); 106EXPORT_SYMBOL(pci_dram_offset);
107EXPORT_SYMBOL(pci_alloc_consistent); 107EXPORT_SYMBOL(pci_alloc_consistent);
108EXPORT_SYMBOL(pci_free_consistent); 108EXPORT_SYMBOL(pci_free_consistent);
109EXPORT_SYMBOL(pci_bus_to_hose);
110#endif /* CONFIG_PCI */ 109#endif /* CONFIG_PCI */
111 110
112EXPORT_SYMBOL(start_thread); 111EXPORT_SYMBOL(start_thread);
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c
index 5cb2188ee406..73cd5b05a84e 100644
--- 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)
145 */ 145 */
146 dev->transparent = 1; 146 dev->transparent = 1;
147 147
148 hose = pci_bus_to_hose(dev->bus->number); 148 hose = pci_bus_to_host(dev->bus);
149 if (!hose) { 149 if (!hose) {
150 printk(KERN_ERR "Can't find hose for bus %d\n", 150 printk(KERN_ERR "Can't find hose for bus %d\n",
151 dev->bus->number); 151 dev->bus->number);