lkml.org 
[lkml]   [2020]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 27/49] clk: rockchip: Fix initialization of mux_pll_src_4plls_p
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit e9c006bc782c488f485ffe50de20b44e1e3daa18 ]

    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: 307a2e9ac524 ("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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/rockchip/clk-rk3228.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c
    index 04f4f3739e3be..8d11d76e1db7c 100644
    --- a/drivers/clk/rockchip/clk-rk3228.c
    +++ b/drivers/clk/rockchip/clk-rk3228.c
    @@ -144,7 +144,7 @@ PNAME(mux_usb480m_p) = { "usb480m_phy", "xin24m" };
    PNAME(mux_hdmiphy_p) = { "hdmiphy_phy", "xin24m" };
    PNAME(mux_aclk_cpu_src_p) = { "cpll_aclk_cpu", "gpll_aclk_cpu", "hdmiphy_aclk_cpu" };

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


    \
     
     \ /
      Last update: 2020-09-21 19:00    [W:4.369 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site