diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 14:06:53 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 14:06:53 -0700 |
| commit | 6016a363f6b56b46b24655bcfc0499b715851cf3 (patch) | |
| tree | aaca35be4765ec7c7d847bed702c121bbd1b8a81 /include/linux/of.h | |
| parent | 923f7e30b480438f1e86e01e5cde814248b59a39 (diff) | |
| download | linux-6016a363f6b56b46b24655bcfc0499b715851cf3.tar.gz linux-6016a363f6b56b46b24655bcfc0499b715851cf3.tar.bz2 linux-6016a363f6b56b46b24655bcfc0499b715851cf3.zip | |
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>
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index d4c014a35ea5..dbabf86e0b7a 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -39,10 +39,7 @@ struct of_irq_controller; struct device_node { const char *name; const char *type; - phandle node; -#if !defined(CONFIG_SPARC) - phandle linux_phandle; -#endif + phandle phandle; char *full_name; struct property *properties; |