Skip to content

Commit 1c02a41

Browse files
nathanchanceSomasundaram Krishnasamy
authored andcommitted
clk: rockchip: Fix initialization of mux_pll_src_4plls_p
[ Upstream commit e9c006b ] 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: 307a2e9 ("clk: rockchip: add clock controller for rk3228") Link: ClangBuiltLinux/linux#1123 Signed-off-by: Nathan Chancellor <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Heiko Stübner <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 292a391e668b159b05eedcc2f23b09ee1b94a95c)
1 parent 9511ee4 commit 1c02a41

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/clk/rockchip/clk-rk3228.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ PNAME(mux_usb480m_p) = { "usb480m_phy", "xin24m" };
144144
PNAME(mux_hdmiphy_p) = { "hdmiphy_phy", "xin24m" };
145145
PNAME(mux_aclk_cpu_src_p) = { "cpll_aclk_cpu", "gpll_aclk_cpu", "hdmiphy_aclk_cpu" };
146146

147-
PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "hdmiphy" "usb480m" };
147+
PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "hdmiphy", "usb480m" };
148148
PNAME(mux_pll_src_3plls_p) = { "cpll", "gpll", "hdmiphy" };
149149
PNAME(mux_pll_src_2plls_p) = { "cpll", "gpll" };
150150
PNAME(mux_sclk_hdmi_cec_p) = { "cpll", "gpll", "xin24m" };

0 commit comments

Comments
 (0)