of: unify phandle name in struct device_node

In struct device_node, the phandle is named 'linux_phandle' for PowerPC
and MicroBlaze, and 'node' for SPARC.  There is no good reason for the
difference, it is just an artifact of the code diverging over a couple
of years.  This patch renames both to simply .phandle.

Note: the .node also existed in PowerPC/MicroBlaze, but the only user
seems to be arch/powerpc/platforms/powermac/pfunc_core.c.  It doesn't
look like the assignment between .linux_phandle and .node is
significantly different enough to warrant the separate code paths
unless ibm,phandle properties actually appear in Apple device trees.

I think it is safe to eliminate the old .node property and use
phandle everywhere.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

5 files changed, 8 insertions, 8 deletions

diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c
index b171ae8de90d..b062de9424a4 100644
--- a/arch/sparc/kernel/devices.c
+++ b/arch/sparc/kernel/devices.c
@@ -59,7 +59,7 @@ static int __cpu_find_by(int (*compare)(int, int, void *), void *compare_arg,
 
         cur_inst = 0;
         for_each_node_by_type(dp, "cpu") {
-                int err = check_cpu_node(dp->node, &cur_inst,
+                int err = check_cpu_node(dp->phandle, &cur_inst,
                                          compare, compare_arg,
                                          prom_node, mid);
                 if (!err) {
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 4c26eb59e742..09138d403c7f 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -433,7 +433,7 @@ build_resources:
         if (!parent)
                 dev_set_name(&op->dev, "root");
         else
-                dev_set_name(&op->dev, "%08x", dp->node);
+                dev_set_name(&op->dev, "%08x", dp->phandle);
 
         if (of_device_register(op)) {
                 printk("%s: Could not register of device.\n",
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 881947e59e95..036f18ae59a6 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -666,7 +666,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
         if (!parent)
                 dev_set_name(&op->dev, "root");
         else
-                dev_set_name(&op->dev, "%08x", dp->node);
+                dev_set_name(&op->dev, "%08x", dp->phandle);
 
         if (of_device_register(op)) {
                 printk("%s: Could not register of device.\n",
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index d80a65d9e893..5832e13dfeeb 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -42,7 +42,7 @@ struct device_node *of_find_node_by_phandle(phandle handle)
         struct device_node *np;
 
         for (np = allnodes; np; np = np->allnext)
-                if (np->node == handle)
+                if (np->phandle == handle)
                         break;
 
         return np;
@@ -89,7 +89,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len
                         void *old_val = prop->value;
                         int ret;
 
-                        ret = prom_setprop(dp->node, name, val, len);
+                        ret = prom_setprop(dp->phandle, name, val, len);
 
                         err = -EINVAL;
                         if (ret >= 0) {
@@ -236,7 +236,7 @@ static struct device_node * __init prom_create_node(phandle node,
 
         dp->name = get_one_property(node, "name");
         dp->type = get_one_property(node, "device_type");
-        dp->node = node;
+        dp->phandle = node;
 
         dp->properties = build_prop_list(node);
 
@@ -313,7 +313,7 @@ void __init prom_build_devicetree(void)
 
         nextp = &allnodes->allnext;
         allnodes->child = prom_build_tree(allnodes,
-                                          prom_getchild(allnodes->node),
+                                          prom_getchild(allnodes->phandle),
                                           &nextp);
         of_console_init();
 
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index aa36223497b9..eb14844a0021 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -370,7 +370,7 @@ static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
         } else {
                 struct device_node *dp = of_find_node_by_cpuid(cpu);
 
-                prom_startcpu(dp->node, entry, cookie);
+                prom_startcpu(dp->phandle, entry, cookie);
         }
 
         for (timeout = 0; timeout < 50000; timeout++) {