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>

6 files changed, 9 insertions, 9 deletions

diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index b4951eb0358e..103fdf6b0b89 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -565,9 +565,9 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp)
         int devidx = 0;
 
         while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) {
-                if (!strcmp(op->node->name, "temperature"))
+                if (!strcmp(op->dev.of_node->name, "temperature"))
                         attach_one_temp(bp, op, temp_index++);
-                if (!strcmp(op->node->name, "fan-control"))
+                if (!strcmp(op->dev.of_node->name, "fan-control"))
                         attach_one_fan(bp, op, fan_index++);
         }
         if (temp_index != 0 && fan_index != 0) {
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 7e30e5f6e032..1543ac32b79b 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -97,7 +97,7 @@ struct bbc_i2c_client *bbc_i2c_attach(struct bbc_i2c_bus *bp, struct of_device *
         client->bp = bp;
         client->op = op;
 
-        reg = of_get_property(op->node, "reg", NULL);
+        reg = of_get_property(op->dev.of_node, "reg", NULL);
         if (!reg) {
                 kfree(client);
                 return NULL;
@@ -327,7 +327,7 @@ static struct bbc_i2c_bus * __init attach_one_i2c(struct of_device *op, int inde
         spin_lock_init(&bp->lock);
 
         entry = 0;
-        for (dp = op->node->child;
+        for (dp = op->dev.of_node->child;
              dp && entry < 8;
              dp = dp->sibling, entry++) {
                 struct of_device *child_op;
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 3e59189f4137..7fc7f34f3466 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -216,7 +216,7 @@ static int __devinit d7s_probe(struct of_device *op,
         writeb(regs,  p->regs);
 
         printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%llx] %s\n",
-               op->node->full_name,
+               op->dev.of_node->full_name,
                (regs & D7S_FLIP) ? " (FLIPPED)" : "",
                op->resource[0].start,
                sol_compat ? "in sol_compat mode" : "");
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index c6e2eff19409..a5fe20faf4f7 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1043,7 +1043,7 @@ static int __devinit envctrl_probe(struct of_device *op,
                 return -ENOMEM;
 
         index = 0;
-        dp = op->node->child;
+        dp = op->dev.of_node->child;
         while (dp) {
                 if (!strcmp(dp->name, "gpio")) {
                         i2c_childlist[index].i2ctype = I2C_GPIO;
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 19f255b97c86..202ff8f75afb 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -162,7 +162,7 @@ static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops };
 static int __devinit flash_probe(struct of_device *op,
                                  const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
         struct device_node *parent;
 
         parent = dp->parent;
@@ -184,7 +184,7 @@ static int __devinit flash_probe(struct of_device *op,
         flash.busy = 0;
 
         printk(KERN_INFO "%s: OBP Flash, RD %lx[%lx] WR %lx[%lx]\n",
-               op->node->full_name,
+               op->dev.of_node->full_name,
                flash.read_base, flash.read_size,
                flash.write_base, flash.write_size);
 
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index 2c56fd56ec63..acc6738aa61f 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -382,7 +382,7 @@ static int __devinit uctrl_probe(struct of_device *op,
 
         sbus_writel(UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK, &p->regs->uctrl_intr);
         printk(KERN_INFO "%s: uctrl regs[0x%p] (irq %d)\n",
-               op->node->full_name, p->regs, p->irq);
+               op->dev.of_node->full_name, p->regs, p->irq);
         uctrl_get_event_status(p);
         uctrl_get_external_status(p);