diff options
| author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2012-11-22 12:16:43 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-29 18:27:19 +0100 |
| commit | b8fbdc42c5c5df8ab1f358fe90e3a8a1bdc9ae48 (patch) | |
| tree | 93e441ba5066c1c4593a127d39625122099f242a | |
| parent | Merge remote-tracking branch 'grant/devicetree/next' into for-next (diff) | |
| download | linux-b8fbdc42c5c5df8ab1f358fe90e3a8a1bdc9ae48.tar.xz linux-b8fbdc42c5c5df8ab1f358fe90e3a8a1bdc9ae48.zip | |
of: add 'const' for of_parse_phandle parameter *np
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.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
[grant.likely: drop extraneous whitespace change]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | drivers/of/base.c | 4 | ||||
| -rw-r--r-- | include/linux/of.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 0ceb26a16050..c3724110a288 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -978,8 +978,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; diff --git a/include/linux/of.h b/include/linux/of.h index 13e0aacb4d9f..7337dc109c89 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -270,7 +270,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, @@ -438,7 +438,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) { |