[PATCH] of: add 'const' for of_parse_phandle parameter *np

Steffen Trumtrar s.trumtrar at pengutronix.de
Thu Nov 22 22:16:43 EST 2012


The existing function does not change the passed device_node pointer. It is
only handed to of_get_property which itself takes a const struct device_node.

of_parse_phandle can therefore take a const pointer as well.

Cc: Grant Likely <grant.likely at secretlib.ca>
Cc: Rob Herring <rob.herring at calxeda.com>
Signed-off-by: Steffen Trumtrar <s.trumtrar at pengutronix.de>
---
 drivers/of/base.c  |    5 +++--
 include/linux/of.h |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index af3b22a..eca45b1 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -893,8 +893,8 @@ EXPORT_SYMBOL_GPL(of_property_count_strings);
  * Returns the device_node pointer with refcount incremented.  Use
  * of_node_put() on it when done.
  */
-struct device_node *
-of_parse_phandle(struct device_node *np, const char *phandle_name, int index)
+struct device_node *of_parse_phandle(const struct device_node *np,
+				     const char *phandle_name, int index)
 {
 	const __be32 *phandle;
 	int size;
@@ -905,6 +905,7 @@ of_parse_phandle(struct device_node *np, const char *phandle_name, int index)
 
 	return of_find_node_by_phandle(be32_to_cpup(phandle + index));
 }
+
 EXPORT_SYMBOL(of_parse_phandle);
 
 /**
diff --git a/include/linux/of.h b/include/linux/of.h
index b4e50d5..634b03f 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -255,7 +255,7 @@ extern int of_n_size_cells(struct device_node *np);
 extern const struct of_device_id *of_match_node(
 	const struct of_device_id *matches, const struct device_node *node);
 extern int of_modalias_node(struct device_node *node, char *modalias, int len);
-extern struct device_node *of_parse_phandle(struct device_node *np,
+extern struct device_node *of_parse_phandle(const struct device_node *np,
 					    const char *phandle_name,
 					    int index);
 extern int of_parse_phandle_with_args(struct device_node *np,
@@ -411,7 +411,7 @@ static inline int of_property_match_string(struct device_node *np,
 	return -ENOSYS;
 }
 
-static inline struct device_node *of_parse_phandle(struct device_node *np,
+static inline struct device_node *of_parse_phandle(const struct device_node *np,
 						   const char *phandle_name,
 						   int index)
 {
-- 
1.7.10.4



More information about the devicetree-discuss mailing list