powerpc: Drop archdata numa_node

Use the struct device's numa_node instead; use accessor functions
to get/set numa_node.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index e06420af5fe9..ef92e7146215 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -556,11 +556,11 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
          * node's iommu. We -might- do something smarter later though it may
          * never be necessary
          */
-        iommu = cell_iommu_for_node(archdata->numa_node);
+        iommu = cell_iommu_for_node(dev_to_node(dev));
         if (iommu == NULL || list_empty(&iommu->windows)) {
                 printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
                        archdata->of_node ? archdata->of_node->full_name : "?",
-                       archdata->numa_node);
+                       dev_to_node(dev));
                 return NULL;
         }
         window = list_entry(iommu->windows.next, struct iommu_window, list);
@@ -577,7 +577,7 @@ static void *dma_fixed_alloc_coherent(struct device *dev, size_t size,
                 return iommu_alloc_coherent(dev, cell_get_iommu_table(dev),
                                             size, dma_handle,
                                             device_to_mask(dev), flag,
-                                            dev->archdata.numa_node);
+                                            dev_to_node(dev));
         else
                 return dma_direct_ops.alloc_coherent(dev, size, dma_handle,
                                                      flag);
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 280ee88cb0b0..a789bf58ca8b 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -762,7 +762,7 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)
         };
 
         dev->core.archdata.of_node = NULL;
-        dev->core.archdata.numa_node = 0;
+        set_dev_node(&dev->core, 0);
 
         pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id);