diff options
| author | Guennadi Liakhovetski | 2012-12-10 20:41:30 +0100 |
|---|---|---|
| committer | Grant Likely | 2012-12-11 17:30:16 +0000 |
| commit | 93c667ca2598bd84f1bd3f2fa176af69707699fe (patch) | |
| tree | f71861d55df741d0fee6232c7ae6d81744c42ed4 | |
| parent | 1daa8a0b2000974e07eacbabecd61bccadc933b9 (diff) | |
of: *node argument to of_parse_phandle_with_args should be const
The "struct device_node *" argument of of_parse_phandle_with_args() can
be const. Making this change makes it explicit that the function will
not modify a node.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
[grant.likely: Resolved conflict with previous patch modifying of_parse_phandle()]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | drivers/of/base.c | 2 | ||||
| -rw-r--r-- | include/linux/of.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 538e3cfad23e..be846408dbc1 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1025,7 +1025,7 @@ EXPORT_SYMBOL(of_parse_phandle); * To get a device_node of the `node2' node you may call this: * of_parse_phandle_with_args(node3, "list", "#list-cells", 1, &args); */ -int of_parse_phandle_with_args(struct device_node *np, const char *list_name, +int of_parse_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name, int index, struct of_phandle_args *out_args) { diff --git a/include/linux/of.h b/include/linux/of.h index 60053bd7e79a..6cfea9aa401f 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -273,7 +273,7 @@ extern int of_modalias_node(struct device_node *node, char *modalias, int len); 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, +extern int of_parse_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name, int index, struct of_phandle_args *out_args); |