]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
of: unify phandle name in struct device_node
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 28 Jan 2010 21:06:53 +0000 (14:06 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 28 Jan 2010 21:06:53 +0000 (14:06 -0700)
commit6016a363f6b56b46b24655bcfc0499b715851cf3
treeaaca35be4765ec7c7d847bed702c121bbd1b8a81
parent923f7e30b480438f1e86e01e5cde814248b59a39
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>
16 files changed:
arch/microblaze/kernel/of_platform.c
arch/microblaze/kernel/prom.c
arch/powerpc/kernel/of_platform.c
arch/powerpc/kernel/prom.c
arch/powerpc/platforms/cell/spu_manage.c
arch/powerpc/platforms/powermac/pfunc_core.c
arch/sparc/kernel/devices.c
arch/sparc/kernel/of_device_32.c
arch/sparc/kernel/of_device_64.c
arch/sparc/kernel/prom_common.c
arch/sparc/kernel/smp_64.c
drivers/of/fdt.c
drivers/sbus/char/openprom.c
drivers/video/aty/atyfb_base.c
include/linux/of.h
sound/aoa/fabrics/layout.c