A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 11:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

of: unify phandle name in struct device_node

Browse source 
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 <[email protected]>
Acked-by: David S. Miller <[email protected]>
Tested-by: Wolfram Sang <[email protected]>
Acked-by: Benjamin Herrenschmidt <[email protected]>
This commit is contained in:
Grant Likely 2010-01-28 14:06:53 -07:00
commit 6016a363f6
16 changed files with 29 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/of/fdt.c
View file

@ -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;