Not only the array of pointers should be const, but also the strings they point to. Add missing const.
Signed-off-by: Sascha Hauer <[email protected]> --- drivers/clk/clk-composite.c | 2 +- drivers/clk/clk-mux.c | 4 ++-- include/linux/clk.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c index 716f6805f3..e21ab98453 100644 --- a/drivers/clk/clk-composite.c +++ b/drivers/clk/clk-composite.c @@ -116,7 +116,7 @@ static struct clk_ops clk_composite_ops = { }; struct clk *clk_register_composite(const char *name, - const char **parent_names, int num_parents, + const char * const *parent_names, int num_parents, struct clk *mux_clk, struct clk *rate_clk, struct clk *gate_clk, diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index d5fe640dce..a108a72d63 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -52,7 +52,7 @@ struct clk_ops clk_mux_ops = { }; struct clk *clk_mux_alloc(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, u8 num_parents, + u8 shift, u8 width, const char * const *parents, u8 num_parents, unsigned flags) { struct clk_mux *m = xzalloc(sizeof(*m)); @@ -77,7 +77,7 @@ void clk_mux_free(struct clk *clk_mux) } struct clk *clk_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, u8 num_parents, unsigned flags) + u8 shift, u8 width, const char * const *parents, u8 num_parents, unsigned flags) { struct clk *m; int ret; diff --git a/include/linux/clk.h b/include/linux/clk.h index ee888dc083..1f20eb2772 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -310,7 +310,7 @@ struct clk { int enable_count; struct list_head list; const char *name; - const char **parent_names; + const char * const *parent_names; int num_parents; struct clk **parents; @@ -384,11 +384,11 @@ struct clk_mux { extern struct clk_ops clk_mux_ops; struct clk *clk_mux_alloc(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, u8 num_parents, + u8 shift, u8 width, const char * const *parents, u8 num_parents, unsigned flags); void clk_mux_free(struct clk *clk_mux); struct clk *clk_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, u8 num_parents, + u8 shift, u8 width, const char * const *parents, u8 num_parents, unsigned flags); struct clk_gate { @@ -429,7 +429,7 @@ struct clk *clk_lookup(const char *name); void clk_dump(int verbose); struct clk *clk_register_composite(const char *name, - const char **parent_names, int num_parents, + const char * const *parent_names, int num_parents, struct clk *mux_clk, struct clk *rate_clk, struct clk *gate_clk, -- 2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
