| Message ID | 1367305883-2997-5-git-send-email-g.liakhovetski@gmx.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
Hi On Tue, 30 Apr 2013, Guennadi Liakhovetski wrote: > of_parse_phandle_with_args() and of_count_phandle_with_args() functions > are declared with their first parameter as const. However, their > respective stubs, used when CONFIG_OF isn't defined, don't have the "const" > modifier. This patch adds it to fix the mismatch. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > --- > include/linux/of.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) This patch is a trivial fix and doesn't actually depend on others in this series, any reason it hasn't been applied yet? Thanks Guennadi > diff --git a/include/linux/of.h b/include/linux/of.h > index 30ae71f..d9dbf73 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -466,7 +466,7 @@ static inline struct device_node *of_parse_phandle(const struct device_node *np, > return NULL; > } > > -static inline int of_parse_phandle_with_args(struct device_node *np, > +static inline int of_parse_phandle_with_args(const struct device_node *np, > const char *list_name, > const char *cells_name, > int index, > @@ -485,7 +485,7 @@ static inline int of_parse_phandle_with_child_args(const struct device_node *np, > return -ENOSYS; > } > > -static inline int of_count_phandle_with_args(struct device_node *np, > +static inline int of_count_phandle_with_args(const struct device_node *np, > const char *list_name, > const char *cells_name) > { > -- > 1.7.2.5 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/of.h b/include/linux/of.h index 30ae71f..d9dbf73 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -466,7 +466,7 @@ static inline struct device_node *of_parse_phandle(const struct device_node *np, return NULL; } -static inline int of_parse_phandle_with_args(struct device_node *np, +static inline int of_parse_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name, int index, @@ -485,7 +485,7 @@ static inline int of_parse_phandle_with_child_args(const struct device_node *np, return -ENOSYS; } -static inline int of_count_phandle_with_args(struct device_node *np, +static inline int of_count_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name) {
of_parse_phandle_with_args() and of_count_phandle_with_args() functions are declared with their first parameter as const. However, their respective stubs, used when CONFIG_OF isn't defined, don't have the "const" modifier. This patch adds it to fix the mismatch. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> --- include/linux/of.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)