]> git.baikalelectronics.ru Git - kernel.git/commit
clk: rockchip: Fix initialization of mux_pll_src_4plls_p
authorNathan Chancellor <natechancellor@gmail.com>
Mon, 10 Aug 2020 04:40:20 +0000 (21:40 -0700)
committerStephen Boyd <sboyd@kernel.org>
Wed, 19 Aug 2020 03:09:02 +0000 (20:09 -0700)
commit1764ed21f7c14d4ccd1f8d3a204c399732c8af0e
tree59bff2acf037c7a7370aa00bd4b76f4cb1f7c378
parent010dfd6f00f79d78a760a90acacfbf8e94d5995c
clk: rockchip: Fix initialization of mux_pll_src_4plls_p

A new warning in Clang points out that the initialization of
mux_pll_src_4plls_p appears incorrect:

../drivers/clk/rockchip/clk-rk3228.c:140:58: warning: suspicious
concatenation of string literals in an array initialization; did you
mean to separate the elements with a comma? [-Wstring-concatenation]
PNAME(mux_pll_src_4plls_p)      = { "cpll", "gpll", "hdmiphy" "usb480m" };
                                                              ^
                                                             ,
../drivers/clk/rockchip/clk-rk3228.c:140:48: note: place parentheses
around the string literal to silence warning
PNAME(mux_pll_src_4plls_p)      = { "cpll", "gpll", "hdmiphy" "usb480m" };
                                                    ^
1 warning generated.

Given the name of the variable and the same variable name in rv1108, it
seems that this should have been four distinct elements. Fix it up by
adding the comma as suggested.

Fixes: a7ca52f2a69f ("clk: rockchip: add clock controller for rk3228")
Link: https://github.com/ClangBuiltLinux/linux/issues/1123
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Link: https://lore.kernel.org/r/20200810044020.2063350-1-natechancellor@gmail.com
Reviewed-by: Heiko Stübner <heiko@sntech.de>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/rockchip/clk-rk3228.c