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>

3 files changed, 9 insertions, 10 deletions

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 616a4767a95..7f8861121a3 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -310,12 +310,11 @@ unsigned long __init unflatten_dt_node(unsigned long mem,
                                         __alignof__(struct property));
                 if (allnextpp) {
                         if (strcmp(pname, "linux,phandle") == 0) {
-                                np->node = *((u32 *)*p);
-                                if (np->linux_phandle == 0)
-                                        np->linux_phandle = np->node;
+                                if (np->phandle == 0)
+                                        np->phandle = *((u32 *)*p);
                         }
                         if (strcmp(pname, "ibm,phandle") == 0)
-                                np->linux_phandle = *((u32 *)*p);
+                                np->phandle = *((u32 *)*p);
                         pp->name = pname;
                         pp->length = sz;
                         pp->value = (void *)*p;
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 75ac19b1192..fc2f676e984 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -233,7 +233,7 @@ static int opromnext(void __user *argp, unsigned int cmd, struct device_node *dp
 
         ph = 0;
         if (dp)
-                ph = dp->node;
+                ph = dp->phandle;
 
         data->current_node = dp;
         *((int *) op->oprom_array) = ph;
@@ -256,7 +256,7 @@ static int oprompci2node(void __user *argp, struct device_node *dp, struct openp
 
                 dp = pci_device_to_OF_node(pdev);
                 data->current_node = dp;
-                *((int *)op->oprom_array) = dp->node;
+                *((int *)op->oprom_array) = dp->phandle;
                 op->oprom_size = sizeof(int);
                 err = copyout(argp, op, bufsize + sizeof(int));
 
@@ -273,7 +273,7 @@ static int oprompath2node(void __user *argp, struct device_node *dp, struct open
 
         dp = of_find_node_by_path(op->oprom_array);
         if (dp)
-                ph = dp->node;
+                ph = dp->phandle;
         data->current_node = dp;
         *((int *)op->oprom_array) = ph;
         op->oprom_size = sizeof(int);
@@ -540,7 +540,7 @@ static int opiocgetnext(unsigned int cmd, void __user *argp)
                 }
         }
         if (dp)
-                nd = dp->node;
+                nd = dp->phandle;
         if (copy_to_user(argp, &nd, sizeof(phandle)))
                 return -EFAULT;
 
@@ -570,7 +570,7 @@ static int openprom_bsd_ioctl(struct inode * inode, struct file * file,
         case OPIOCGETOPTNODE:
                 BUILD_BUG_ON(sizeof(phandle) != sizeof(int));
 
-                if (copy_to_user(argp, &options_node->node, sizeof(phandle)))
+                if (copy_to_user(argp, &options_node->phandle, sizeof(phandle)))
                         return -EFAULT;
 
                 return 0;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 913b4a47ae5..bb20987d58a 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3104,7 +3104,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
         }
 
         dp = pci_device_to_OF_node(pdev);
-        if (node == dp->node) {
+        if (node == dp->phandle) {
                 struct fb_var_screeninfo *var = &default_var;
                 unsigned int N, P, Q, M, T, R;
                 u32 v_total, h_total;