[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>

7 files changed, 14 insertions, 16 deletions

diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c
index 965bfcc9ad2d..ee172aa42aa7 100644
--- a/arch/powerpc/kernel/isa-bridge.c
+++ b/arch/powerpc/kernel/isa-bridge.c
@@ -145,7 +145,7 @@ void __init isa_bridge_find_early(struct pci_controller *hose)
         for_each_node_by_type(np, "isa") {
                 /* Look for our hose being a parent */
                 for (parent = of_get_parent(np); parent;) {
-                        if (parent == hose->arch_data) {
+                        if (parent == hose->dn) {
                                 of_node_put(parent);
                                 break;
                         }
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 5a9d4c7bfec5..2f3f30efffed 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -62,7 +62,7 @@ struct pci_controller *pcibios_alloc_controller(struct device_node *dev)
         phb->global_number = global_phb_number++;
         list_add_tail(&phb->list_node, &hose_list);
         spin_unlock(&hose_spinlock);
-        phb->arch_data = dev;
+        phb->dn = dev;
         phb->is_dynamic = mem_init_done;
 #ifdef CONFIG_PPC64
         if (dev) {
@@ -137,7 +137,7 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
         while(node) {
                 struct pci_controller *hose, *tmp;
                 list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
-                        if (hose->arch_data == node)
+                        if (hose->dn == node)
                                 return hose;
                 node = node->parent;
         }
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 0e2bee46304c..096c97e03aa6 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -662,8 +662,8 @@ pcibios_make_OF_bus_map(void)
 
         /* For each hose, we begin searching bridges */
         list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                struct device_node* node;       
-                node = (struct device_node *)hose->arch_data;
+                struct device_node* node = hose->dn;
+
                 if (!node)
                         continue;
                 make_one_node_map(node, hose->first_busno);
@@ -742,7 +742,7 @@ static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus)
                 struct pci_controller *hose = pci_bus_to_host(bus);
                 if (hose == NULL)
                         return NULL;
-                return of_node_get(hose->arch_data);
+                return of_node_get(hose->dn);
         }
 
         /* not a root bus, we need to get our parent */
@@ -812,9 +812,9 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn)
                 return -ENODEV;
         /* Make sure it's really a PCI device */
         hose = pci_find_hose_for_OF_device(node);
-        if (!hose || !hose->arch_data)
+        if (!hose || !hose->dn)
                 return -ENODEV;
-        if (!scan_OF_pci_childs(((struct device_node*)hose->arch_data)->child,
+        if (!scan_OF_pci_childs(hose->dn->child,
                         find_OF_pci_device_filter, (void *)node))
                 return -ENODEV;
         reg = of_get_property(node, "reg", NULL);
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);
 void __devinit scan_phb(struct pci_controller *hose)
 {
         struct pci_bus *bus;
-        struct device_node *node = hose->arch_data;
+        struct device_node *node = hose->dn;
         int i, mode;
         struct resource *res;
 
@@ -705,8 +705,7 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
         if (hose->io_base_alloc == 0)
                 return 0;
 
-        DBG("IO unmapping for PHB %s\n",
-            ((struct device_node *)hose->arch_data)->full_name);
+        DBG("IO unmapping for PHB %s\n", hose->dn->full_name);
         DBG("  alloc=0x%p\n", hose->io_base_alloc);
 
         /* This is a PHB, we fully unmap the IO area */
@@ -765,8 +764,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
         hose->io_base_virt = (void __iomem *)(area->addr +
                                               hose->io_base_phys - phys_page);
 
-        DBG("IO mapping for PHB %s\n",
-            ((struct device_node *)hose->arch_data)->full_name);
+        DBG("IO mapping for PHB %s\n", hose->dn->full_name);
         DBG("  phys=0x%016lx, virt=0x%p (alloc=0x%p)\n",
             hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
         DBG("  size=0x%016lx (alloc=0x%016lx)\n",
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index b4839038613d..85d4d8924b5c 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -133,7 +133,7 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
  */
 void __devinit pci_devs_phb_init_dynamic(struct pci_controller *phb)
 {
-        struct device_node * dn = (struct device_node *) phb->arch_data;
+        struct device_node *dn = phb->dn;
         struct pci_dn *pdn;
 
         /* PHB nodes themselves must not match */
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index b5c96af955c6..6bdfaf3f99ea 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -273,7 +273,7 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
 #else
                         struct pci_controller *host;
                         host = pci_bus_to_host(pdev->bus);
-                        ppnode = host ? host->arch_data : NULL;
+                        ppnode = host ? host->dn : NULL;
 #endif
                         /* No node for host bridge ? give up */
                         if (ppnode == NULL)
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 21f14e57d1f3..3650eb50c27d 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -260,7 +260,7 @@ static int phb_set_bus_ranges(struct device_node *dev,
 
 int __devinit rtas_setup_phb(struct pci_controller *phb)
 {
-        struct device_node *dev = phb->arch_data;
+        struct device_node *dev = phb->dn;
 
         if (is_python(dev))
                 python_countermeasures(dev);