summaryrefslogtreecommitdiff
path: root/include/linux/of.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-11-18 13:35:31 -0800
committerDavid S. Miller <davem@davemloft.net>2018-11-18 13:35:31 -0800
commit20a9da34ae009176e443e217f3747635fc4bc57f (patch)
tree92e27b19a55ec7c039a4941e861f668fd3b0cdc8 /include/linux/of.h
parent25e19c1fe421280a47f37c3571aa379e6e67966c (diff)
parent86ef771ed543ad19fd984e715348eaeeb0b4e035 (diff)
Merge branch 'sparc-OF-name-and-device_type-rework'
Rob Herring says: ==================== sparc: OF name and device_type rework All other platforms have been converted to only store the local node name in device_node.full_name except Sparc. Sparc was complicated by having a path_component_name in addition to full_name and name. By switching full_name to just the local node name, path_component_name becomes redundant and can be removed. The rest of the series converts the sparc code to use printf specifiers and helper functions to access node name and device_type instead of directly accessing device_node full_name, name and type pointers. I've tested this series under qemu. v2: - Add patch using of_node_name_eq for openpromfs - Add patch converting some resource names to full_name - Also drop full path on !Sparc PDT node name construction - Add a few missed %pOFn conversions ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/of.h')
-rw-r--r--include/linux/of.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index a5aee3c438ad..0fe5bef81a7e 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -66,7 +66,6 @@ struct device_node {
unsigned long _flags;
void *data;
#if defined(CONFIG_SPARC)
- const char *path_component_name;
unsigned int unique_id;
struct of_irq_controller *irq_trans;
#endif