On Thu, 15 May 2014 14:44:30 +1000, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Make the CONFIG_OF=n prototpe of of_node_full_name() mateh the CONFIG_OF=y > version. > > Fixes compile warnings like this: > > sound/soc/soc-core.c: In function 'soc_check_aux_dev': > sound/soc/soc-core.c:1667:3: warning: passing argument 1 of 'of_node_full_name' discards 'const' qualifier from pointer target type [enabled by default] > codecname = of_node_full_name(aux_dev->codec_of_node); > > when CONFIG_OF is not defined. Good catch, thanks. Applied and will be sent to Linus shortly. g. > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > --- > include/linux/of.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/of.h b/include/linux/of.h > index 3bad8d106e0e..e6f0988c1c68 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -349,7 +349,7 @@ int of_device_is_stdout_path(struct device_node *dn); > > #else /* CONFIG_OF */ > > -static inline const char* of_node_full_name(struct device_node *np) > +static inline const char* of_node_full_name(const struct device_node *np) > { > return "<no-node>"; > } > -- > 2.0.0.rc2 > > -- > Cheers, > Stephen Rothwell sfr@xxxxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html