aboutsummaryrefslogtreecommitdiff
path: root/drivers/clk/imx/clk-busy.c
diff options
context:
space:
mode:
authorGravatar A.s. Dong <aisheng.dong@nxp.com> 2018-11-14 13:02:00 +0000
committerGravatar Stephen Boyd <sboyd@kernel.org> 2018-12-03 11:31:36 -0800
commit9e5ef7a57ca75a1b9411c46caeeb6881124284a3 (patch)
treef66619d148e34ece6b94eff25394b02299dbe21a /drivers/clk/imx/clk-busy.c
parentdt-bindings: clock: add imx7ulp clock binding doc (diff)
downloadlinux-9e5ef7a57ca75a1b9411c46caeeb6881124284a3.tar.gz
linux-9e5ef7a57ca75a1b9411c46caeeb6881124284a3.tar.bz2
linux-9e5ef7a57ca75a1b9411c46caeeb6881124284a3.zip
clk: imx: make mux parent strings const
As the commit 2893c379461a ("clk: make strings in parent name arrays const"), let's make the parent strings const, otherwise we may meet the following warning when compiling: drivers/clk/imx/clk-imx7ulp.c: In function 'imx7ulp_clocks_init': drivers/clk/imx/clk-imx7ulp.c:73:35: warning: passing argument 5 of 'imx_clk_mux_flags' discards 'const' qualifier from pointer target type clks[IMX7ULP_CLK_APLL_PRE_SEL] = imx_clk_mux_flags("apll_pre_sel", base + 0x508, 0, 1, pll_pre_sels, ARRAY_SIZE(pll_pre_sels), CLK_SET_PARENT_GATE); ^ In file included from drivers/clk/imx/clk-imx7ulp.c:23:0: drivers/clk/imx/clk.h:200:27: note: expected 'const char **' but argument is of type 'const char * const*' ... Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk/imx/clk-busy.c')
-rw-r--r--drivers/clk/imx/clk-busy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-busy.c b/drivers/clk/imx/clk-busy.c
index 99036527eb0d..e695622c5aa5 100644
--- a/drivers/clk/imx/clk-busy.c
+++ b/drivers/clk/imx/clk-busy.c
@@ -154,7 +154,7 @@ static const struct clk_ops clk_busy_mux_ops = {
struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift,
u8 width, void __iomem *busy_reg, u8 busy_shift,
- const char **parent_names, int num_parents)
+ const char * const *parent_names, int num_parents)
{
struct clk_busy_mux *busy;
struct clk *clk;