[PATCH V5 4/6] of: call __of_parse_phandle_with_args from of_parse_phandle
From: Stephen Warren <hidden>
Date: 2013-08-12 17:36:45
Also in:
linux-devicetree
Subsystem:
open firmware and flattened device tree, the rest · Maintainers:
Rob Herring, Saravana Kannan, Linus Torvalds
From: Stephen Warren <redacted> The simplest case of __of_parse_phandle_with_args() implements of_parse_phandle(), except that it doesn't return the node referenced by the phandle. Modify it to do so, and then rewrite of_parse_phandle() to call __of_parse_phandle_with_args() rather than open-coding the simple case. Signed-off-by: Stephen Warren <redacted> --- v5: New patch. --- drivers/of/base.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 2f92522..79ed82c 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c@@ -1202,14 +1202,16 @@ static int __of_parse_phandle_with_args(const struct device_node *np, struct device_node *of_parse_phandle(const struct device_node *np, const char *phandle_name, int index) { - const __be32 *phandle; - int size; + struct of_phandle_args args; - phandle = of_get_property(np, phandle_name, &size); - if ((!phandle) || (size < sizeof(*phandle) * (index + 1))) + if (index < 0) + return NULL; + + if (__of_parse_phandle_with_args(np, phandle_name, NULL, 0, + index, &args)) return NULL; - return of_find_node_by_phandle(be32_to_cpup(phandle + index)); + return args.np; } EXPORT_SYMBOL(of_parse_phandle);
--
1.8.1.5