of: Always use 'struct device.of_node' to get device node pointer.

The following structure elements duplicate the information in
'struct device.of_node' and so are being eliminated.  This patch
makes all readers of these elements use device.of_node instead.

(struct of_device *)->node
(struct dev_archdata *)->prom_node (sparc)
(struct dev_archdata *)->of_node (powerpc & microblaze)

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

3 files changed, 14 insertions, 14 deletions

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 71cf280da184..a9f31631a293 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -140,14 +140,14 @@ static struct dma_map_ops ibmebus_dma_ops = {
 
 static int ibmebus_match_path(struct device *dev, void *data)
 {
-        struct device_node *dn = to_of_device(dev)->node;
+        struct device_node *dn = to_of_device(dev)->dev.of_node;
         return (dn->full_name &&
                 (strcasecmp((char *)data, dn->full_name) == 0));
 }
 
 static int ibmebus_match_node(struct device *dev, void *data)
 {
-        return to_of_device(dev)->node == data;
+        return to_of_device(dev)->dev.of_node == data;
 }
 
 static int ibmebus_create_device(struct device_node *dn)
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 9577e6f4e3bf..285c8490c547 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -13,7 +13,7 @@
 static void of_device_make_bus_id(struct of_device *dev)
 {
         static atomic_t bus_no_reg_magic;
-        struct device_node *node = dev->node;
+        struct device_node *node = dev->dev.of_node;
         const u32 *reg;
         u64 addr;
         int magic;
@@ -96,17 +96,17 @@ int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 
         ofdev = to_of_device(dev);
 
-        if (add_uevent_var(env, "OF_NAME=%s", ofdev->node->name))
+        if (add_uevent_var(env, "OF_NAME=%s", ofdev->dev.of_node->name))
                 return -ENOMEM;
 
-        if (add_uevent_var(env, "OF_TYPE=%s", ofdev->node->type))
+        if (add_uevent_var(env, "OF_TYPE=%s", ofdev->dev.of_node->type))
                 return -ENOMEM;
 
         /* Since the compatible field can contain pretty much anything
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-        compat = of_get_property(ofdev->node, "compatible", &cplen);
+        compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);
         while (compat && *compat && cplen > 0) {
                 if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat))
                         return -ENOMEM;
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 6c1dfc3ff8bc..1c747c474415 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -195,7 +195,7 @@ EXPORT_SYMBOL(of_platform_bus_probe);
 
 static int of_dev_node_match(struct device *dev, void *data)
 {
-        return to_of_device(dev)->node == data;
+        return to_of_device(dev)->dev.of_node == data;
 }
 
 struct of_device *of_find_device_by_node(struct device_node *np)
@@ -213,7 +213,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
 static int of_dev_phandle_match(struct device *dev, void *data)
 {
         phandle *ph = data;
-        return to_of_device(dev)->node->phandle == *ph;
+        return to_of_device(dev)->dev.of_node->phandle == *ph;
 }
 
 struct of_device *of_find_device_by_phandle(phandle ph)
@@ -246,10 +246,10 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,
         if (ppc_md.pci_setup_phb == NULL)
                 return -ENODEV;
 
-        printk(KERN_INFO "Setting up PCI bus %s\n", dev->node->full_name);
+        pr_info("Setting up PCI bus %s\n", dev->dev.of_node->full_name);
 
         /* Alloc and setup PHB data structure */
-        phb = pcibios_alloc_controller(dev->node);
+        phb = pcibios_alloc_controller(dev->dev.of_node);
         if (!phb)
                 return -ENODEV;
 
@@ -263,19 +263,19 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,
         }
 
         /* Process "ranges" property */
-        pci_process_bridge_OF_ranges(phb, dev->node, 0);
+        pci_process_bridge_OF_ranges(phb, dev->dev.of_node, 0);
 
         /* Init pci_dn data structures */
         pci_devs_phb_init_dynamic(phb);
 
         /* Register devices with EEH */
 #ifdef CONFIG_EEH
-        if (dev->node->child)
-                eeh_add_device_tree_early(dev->node);
+        if (dev->dev.of_node->child)
+                eeh_add_device_tree_early(dev->dev.of_node);
 #endif /* CONFIG_EEH */
 
         /* Scan the bus */
-        pcibios_scan_phb(phb, dev->node);
+        pcibios_scan_phb(phb, dev->dev.of_node);
         if (phb->bus == NULL)
                 return -ENXIO;