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>

2 files changed, 4 insertions, 4 deletions

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 7dcc06512e86..6a4c872e00df 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2075,12 +2075,12 @@ static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_dev
 static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match)
 {
 #ifdef EBUS_SUPPORT
-        if (!strcmp(op->node->parent->name, "ebus"))
+        if (!strcmp(op->dev.of_node->parent->name, "ebus"))
                 return cs4231_ebus_probe(op, match);
 #endif
 #ifdef SBUS_SUPPORT
-        if (!strcmp(op->node->parent->name, "sbus") ||
-            !strcmp(op->node->parent->name, "sbi"))
+        if (!strcmp(op->dev.of_node->parent->name, "sbus") ||
+            !strcmp(op->dev.of_node->parent->name, "sbi"))
                 return cs4231_sbus_probe(op, match);
 #endif
         return -ENODEV;
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 2eab6ce48852..1b5192eb5ae5 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2651,7 +2651,7 @@ static int __devinit dbri_probe(struct of_device *op, const struct of_device_id
 
         printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n",
                dev, dbri->regs,
-               dbri->irq, op->node->name[9], dbri->mm.version);
+               dbri->irq, op->dev.of_node->name[9], dbri->mm.version);
         dev++;
 
         return 0;