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>

5 files changed, 13 insertions, 13 deletions

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 101ee6ead05c..3dc7a2fbf025 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -143,7 +143,7 @@ static int of_flash_remove(struct of_device *dev)
 static struct mtd_info * __devinit obsolete_probe(struct of_device *dev,
                                                   struct map_info *map)
 {
-        struct device_node *dp = dev->node;
+        struct device_node *dp = dev->dev.of_node;
         const char *of_probe;
         struct mtd_info *mtd;
         static const char *rom_probe_types[]
@@ -180,7 +180,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
         static const char *part_probe_types[]
                 = { "cmdlinepart", "RedBoot", NULL };
 #endif
-        struct device_node *dp = dev->node;
+        struct device_node *dp = dev->dev.of_node;
         struct resource res;
         struct of_flash *info;
         const char *probe_type = match->data;
@@ -204,7 +204,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
         p = of_get_property(dp, "reg", &count);
         if (count % reg_tuple_size != 0) {
                 dev_err(&dev->dev, "Malformed reg property on %s\n",
-                                dev->node->full_name);
+                                dev->dev.of_node->full_name);
                 err = -EINVAL;
                 goto err_flash_remove;
         }
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index fadc4c45b455..5945a23e681f 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -110,7 +110,7 @@ int uflash_devinit(struct of_device *op, struct device_node *dp)
 
 static int __devinit uflash_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;
 
         /* Flashprom must have the "user" property in order to
          * be used by this driver.
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index ae30fb6eed97..4a6079588ab2 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -1030,14 +1030,14 @@ static int __devinit fsl_elbc_ctrl_probe(struct of_device *ofdev,
         init_waitqueue_head(&ctrl->controller.wq);
         init_waitqueue_head(&ctrl->irq_wait);
 
-        ctrl->regs = of_iomap(ofdev->node, 0);
+        ctrl->regs = of_iomap(ofdev->dev.of_node, 0);
         if (!ctrl->regs) {
                 dev_err(&ofdev->dev, "failed to get memory region\n");
                 ret = -ENODEV;
                 goto err;
         }
 
-        ctrl->irq = of_irq_to_resource(ofdev->node, 0, NULL);
+        ctrl->irq = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
         if (ctrl->irq == NO_IRQ) {
                 dev_err(&ofdev->dev, "failed to get irq resource\n");
                 ret = -ENODEV;
@@ -1058,7 +1058,7 @@ static int __devinit fsl_elbc_ctrl_probe(struct of_device *ofdev,
                 goto err;
         }
 
-        for_each_child_of_node(ofdev->node, child)
+        for_each_child_of_node(ofdev->dev.of_node, child)
                 if (of_device_is_compatible(child, "fsl,elbc-fcm-nand"))
                         fsl_elbc_chip_probe(ctrl, child);
 
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index b983cae8c298..c0e05f5ff8a4 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -239,14 +239,14 @@ static int __devinit ndfc_probe(struct of_device *ofdev,
         dev_set_drvdata(&ofdev->dev, ndfc);
 
         /* Read the reg property to get the chip select */
-        reg = of_get_property(ofdev->node, "reg", &len);
+        reg = of_get_property(ofdev->dev.of_node, "reg", &len);
         if (reg == NULL || len != 12) {
                 dev_err(&ofdev->dev, "unable read reg property (%d)\n", len);
                 return -ENOENT;
         }
         ndfc->chip_select = reg[0];
 
-        ndfc->ndfcbase = of_iomap(ofdev->node, 0);
+        ndfc->ndfcbase = of_iomap(ofdev->dev.of_node, 0);
         if (!ndfc->ndfcbase) {
                 dev_err(&ofdev->dev, "failed to get memory\n");
                 return -EIO;
@@ -255,20 +255,20 @@ static int __devinit ndfc_probe(struct of_device *ofdev,
         ccr = NDFC_CCR_BS(ndfc->chip_select);
 
         /* It is ok if ccr does not exist - just default to 0 */
-        reg = of_get_property(ofdev->node, "ccr", NULL);
+        reg = of_get_property(ofdev->dev.of_node, "ccr", NULL);
         if (reg)
                 ccr |= *reg;
 
         out_be32(ndfc->ndfcbase + NDFC_CCR, ccr);
 
         /* Set the bank settings if given */
-        reg = of_get_property(ofdev->node, "bank-settings", NULL);
+        reg = of_get_property(ofdev->dev.of_node, "bank-settings", NULL);
         if (reg) {
                 int offset = NDFC_BCFG0 + (ndfc->chip_select << 2);
                 out_be32(ndfc->ndfcbase + offset, *reg);
         }
 
-        err = ndfc_chip_init(ndfc, ofdev->node);
+        err = ndfc_chip_init(ndfc, ofdev->dev.of_node);
         if (err) {
                 iounmap(ndfc->ndfcbase);
                 return err;
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index a8b9376cf324..edfc27b78513 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -93,7 +93,7 @@ static int __devinit pasemi_nand_probe(struct of_device *ofdev,
                                       const struct of_device_id *match)
 {
         struct pci_dev *pdev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct resource res;
         struct nand_chip *chip;
         int err = 0;