summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2016-10-05 15:37:02 +0300
committerTero Kristo <t-kristo@ti.com>2017-03-08 14:00:25 +0300
commitce382d4766bd82b8fdd487bb57afb1c4f9546de2 (patch)
tree39f7c81f929e7ec3923c466f67a0f702ed7ac9c3
parent2e1a294c0f2273a6d3537c91965ca46a6483bd8c (diff)
downloadlinux-ce382d4766bd82b8fdd487bb57afb1c4f9546de2.tar.xz
clk: ti: enforce const types on string arrays
Constant string arrays should use const char * const instead of just const char *. Change the implementations using these to proper type. Signed-off-by: Tero Kristo <t-kristo@ti.com> Acked-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--drivers/clk/ti/clock.h2
-rw-r--r--drivers/clk/ti/composite.c2
-rw-r--r--drivers/clk/ti/mux.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clk/ti/clock.h b/drivers/clk/ti/clock.h
index ecf82d86118c..cb906a199e66 100644
--- a/drivers/clk/ti/clock.h
+++ b/drivers/clk/ti/clock.h
@@ -86,7 +86,7 @@ struct ti_clk_mux {
int num_parents;
u16 reg;
u8 module;
- const char **parents;
+ const char * const *parents;
u16 flags;
};
diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
index 3f60f990cad8..beea89463ca2 100644
--- a/drivers/clk/ti/composite.c
+++ b/drivers/clk/ti/composite.c
@@ -124,7 +124,7 @@ struct clk *ti_clk_register_composite(struct ti_clk *setup)
struct clk_hw *mux;
struct clk_hw *div;
int num_parents = 1;
- const char **parent_names = NULL;
+ const char * const *parent_names = NULL;
struct clk *clk;
int ret;
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c
index 0da149ed1549..3cc6db4b31fb 100644
--- a/drivers/clk/ti/mux.c
+++ b/drivers/clk/ti/mux.c
@@ -97,10 +97,10 @@ const struct clk_ops ti_clk_mux_ops = {
};
static struct clk *_register_mux(struct device *dev, const char *name,
- const char **parent_names, u8 num_parents,
- unsigned long flags, void __iomem *reg,
- u8 shift, u32 mask, u8 clk_mux_flags,
- u32 *table)
+ const char * const *parent_names,
+ u8 num_parents, unsigned long flags,
+ void __iomem *reg, u8 shift, u32 mask,
+ u8 clk_mux_flags, u32 *table)
{
struct clk_mux *mux;
struct clk *clk;