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>

7 files changed, 19 insertions, 19 deletions

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
index fda7c2a18282..576669fc4fbf 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
@@ -168,7 +168,7 @@ static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev,
         ofchip->gc.get              = mpc52xx_wkup_gpio_get;
         ofchip->gc.set              = mpc52xx_wkup_gpio_set;
 
-        ret = of_mm_gpiochip_add(ofdev->node, &chip->mmchip);
+        ret = of_mm_gpiochip_add(ofdev->dev.of_node, &chip->mmchip);
         if (ret)
                 return ret;
 
@@ -329,7 +329,7 @@ static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev,
         ofchip->gc.get              = mpc52xx_simple_gpio_get;
         ofchip->gc.set              = mpc52xx_simple_gpio_set;
 
-        ret = of_mm_gpiochip_add(ofdev->node, &chip->mmchip);
+        ret = of_mm_gpiochip_add(ofdev->dev.of_node, &chip->mmchip);
         if (ret)
                 return ret;
 
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index a60ee39d3b78..42c507f9c35b 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -734,8 +734,8 @@ static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,
 
         spin_lock_init(&gpt->lock);
         gpt->dev = &ofdev->dev;
-        gpt->ipb_freq = mpc5xxx_get_bus_frequency(ofdev->node);
-        gpt->regs = of_iomap(ofdev->node, 0);
+        gpt->ipb_freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);
+        gpt->regs = of_iomap(ofdev->dev.of_node, 0);
         if (!gpt->regs) {
                 kfree(gpt);
                 return -ENOMEM;
@@ -743,21 +743,21 @@ static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,
 
         dev_set_drvdata(&ofdev->dev, gpt);
 
-        mpc52xx_gpt_gpio_setup(gpt, ofdev->node);
-        mpc52xx_gpt_irq_setup(gpt, ofdev->node);
+        mpc52xx_gpt_gpio_setup(gpt, ofdev->dev.of_node);
+        mpc52xx_gpt_irq_setup(gpt, ofdev->dev.of_node);
 
         mutex_lock(&mpc52xx_gpt_list_mutex);
         list_add(&gpt->list, &mpc52xx_gpt_list);
         mutex_unlock(&mpc52xx_gpt_list_mutex);
 
         /* check if this device could be a watchdog */
-        if (of_get_property(ofdev->node, "fsl,has-wdt", NULL) ||
-            of_get_property(ofdev->node, "has-wdt", NULL)) {
+        if (of_get_property(ofdev->dev.of_node, "fsl,has-wdt", NULL) ||
+            of_get_property(ofdev->dev.of_node, "has-wdt", NULL)) {
                 const u32 *on_boot_wdt;
 
                 gpt->wdt_mode = MPC52xx_GPT_CAN_WDT;
-                on_boot_wdt = of_get_property(ofdev->node, "fsl,wdt-on-boot",
-                                              NULL);
+                on_boot_wdt = of_get_property(ofdev->dev.of_node,
+                                              "fsl,wdt-on-boot", NULL);
                 if (on_boot_wdt) {
                         dev_info(gpt->dev, "used as watchdog\n");
                         gpt->wdt_mode |= MPC52xx_GPT_IS_WDT;
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index d4f8be307cd5..17b99ba7a8cc 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -445,14 +445,14 @@ mpc52xx_lpbfifo_probe(struct of_device *op, const struct of_device_id *match)
         if (lpbfifo.dev != NULL)
                 return -ENOSPC;
 
-        lpbfifo.irq = irq_of_parse_and_map(op->node, 0);
+        lpbfifo.irq = irq_of_parse_and_map(op->dev.of_node, 0);
         if (!lpbfifo.irq)
                 return -ENODEV;
 
-        if (of_address_to_resource(op->node, 0, &res))
+        if (of_address_to_resource(op->dev.of_node, 0, &res))
                 return -ENODEV;
         lpbfifo.regs_phys = res.start;
-        lpbfifo.regs = of_iomap(op->node, 0);
+        lpbfifo.regs = of_iomap(op->dev.of_node, 0);
         if (!lpbfifo.regs)
                 return -ENOMEM;
 
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index f21555d3395a..0176ae8249d5 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -119,12 +119,12 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
         struct device_node *node;
         int ret;
 
-        node = of_get_parent(ofdev->node);
+        node = of_get_parent(ofdev->dev.of_node);
         of_node_put(node);
         if (node != ep8248e_bcsr_node)
                 return -ENODEV;
 
-        ret = of_address_to_resource(ofdev->node, 0, &res);
+        ret = of_address_to_resource(ofdev->dev.of_node, 0, &res);
         if (ret)
                 return ret;
 
@@ -142,7 +142,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
         bus->parent = &ofdev->dev;
         snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
-        ret = of_mdiobus_register(bus, ofdev->node);
+        ret = of_mdiobus_register(bus, ofdev->dev.of_node);
         if (ret)
                 goto err_free_irq;
 
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index 43805348b81e..aa0b764b1cc4 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -321,7 +321,7 @@ static struct platform_suspend_ops mpc83xx_suspend_ops = {
 static int pmc_probe(struct of_device *ofdev,
                      const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct resource res;
         struct pmc_type *type = match->data;
         int ret = 0;
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 8efe48192f3f..177a4f1369b4 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -345,7 +345,7 @@ static int axon_msi_shutdown(struct of_device *device)
 static int axon_msi_probe(struct of_device *device,
                           const struct of_device_id *device_id)
 {
-        struct device_node *dn = device->node;
+        struct device_node *dn = device->dev.of_node;
         struct axon_msic *msic;
         unsigned int virq;
         int dcr_base, dcr_len;
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 0f881f64583e..c44e1b3b91db 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -220,7 +220,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
                                      const struct of_device_id *match)
 {
         struct device *dev = &ofdev->dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct mii_bus *new_bus;
         struct gpio_priv *priv;
         const unsigned int *prop;