aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/pci_64.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-12-09 22:33:21 -0500
committerPaul Mackerras <paulus@samba.org>2007-12-10 21:42:37 -0500
commit44ef339073f67d4abcc62ae52a5fbc069d7a4d29 (patch)
treef7d8dab47b9822bbd22a399f24a3e24d10f96621 /arch/powerpc/kernel/pci_64.c
parent6207e81695c1a64ebed668f26106f3384ad2323a (diff)
[POWERPC] pci_controller->arch_data really is a struct device_node *
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_64.c')
-rw-r--r--arch/powerpc/kernel/pci_64.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 002cd4cac0f3..6b9a8564e735 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -458,7 +458,7 @@ EXPORT_SYMBOL(of_scan_pci_bridge);
458void __devinit scan_phb(struct pci_controller *hose) 458void __devinit scan_phb(struct pci_controller *hose)
459{ 459{
460 struct pci_bus *bus; 460 struct pci_bus *bus;
461 struct device_node *node = hose->arch_data; 461 struct device_node *node = hose->dn;
462 int i, mode; 462 int i, mode;
463 struct resource *res; 463 struct resource *res;
464 464
@@ -705,8 +705,7 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
705 if (hose->io_base_alloc == 0) 705 if (hose->io_base_alloc == 0)
706 return 0; 706 return 0;
707 707
708 DBG("IO unmapping for PHB %s\n", 708 DBG("IO unmapping for PHB %s\n", hose->dn->full_name);
709 ((struct device_node *)hose->arch_data)->full_name);
710 DBG(" alloc=0x%p\n", hose->io_base_alloc); 709 DBG(" alloc=0x%p\n", hose->io_base_alloc);
711 710
712 /* This is a PHB, we fully unmap the IO area */ 711 /* This is a PHB, we fully unmap the IO area */
@@ -765,8 +764,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
765 hose->io_base_virt = (void __iomem *)(area->addr + 764 hose->io_base_virt = (void __iomem *)(area->addr +
766 hose->io_base_phys - phys_page); 765 hose->io_base_phys - phys_page);
767 766
768 DBG("IO mapping for PHB %s\n", 767 DBG("IO mapping for PHB %s\n", hose->dn->full_name);
769 ((struct device_node *)hose->arch_data)->full_name);
770 DBG(" phys=0x%016lx, virt=0x%p (alloc=0x%p)\n", 768 DBG(" phys=0x%016lx, virt=0x%p (alloc=0x%p)\n",
771 hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc); 769 hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
772 DBG(" size=0x%016lx (alloc=0x%016lx)\n", 770 DBG(" size=0x%016lx (alloc=0x%016lx)\n",