lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 086/434] tools/power/cpupower: Fix initializer override in hsw_ext_cstates
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 7e5705c635ecfccde559ebbbe1eaf05b5cc60529 ]

    When building cpupower with clang, the following warning appears:

    utils/idle_monitor/hsw_ext_idle.c:42:16: warning: initializer overrides
    prior initialization of this subobject [-Winitializer-overrides]
    .desc = N_("Processor Package C2"),
    ^~~~~~~~~~~~~~~~~~~~~~
    ./utils/helpers/helpers.h:25:33: note: expanded from macro 'N_'
    #define N_(String) gettext_noop(String)
    ^~~~~~
    ./utils/helpers/helpers.h:23:30: note: expanded from macro
    'gettext_noop'
    #define gettext_noop(String) String
    ^~~~~~
    utils/idle_monitor/hsw_ext_idle.c:41:16: note: previous initialization
    is here
    .desc = N_("Processor Package C9"),
    ^~~~~~~~~~~~~~~~~~~~~~
    ./utils/helpers/helpers.h:25:33: note: expanded from macro 'N_'
    #define N_(String) gettext_noop(String)
    ^~~~~~
    ./utils/helpers/helpers.h:23:30: note: expanded from macro
    'gettext_noop'
    #define gettext_noop(String) String
    ^~~~~~
    1 warning generated.

    This appears to be a copy and paste or merge mistake because the name
    and id fields both have PC9 in them, not PC2. Remove the second
    assignment to fix the warning.

    Fixes: 7ee767b69b68 ("cpupower: Add Haswell family 0x45 specific idle monitor to show PC8,9,10 states")
    Link: https://github.com/ClangBuiltLinux/linux/issues/718
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c | 1 -
    1 file changed, 1 deletion(-)

    diff --git a/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c b/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c
    index 7c7451d3f494..58dbdfd4fa13 100644
    --- a/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c
    +++ b/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c
    @@ -39,7 +39,6 @@ static cstate_t hsw_ext_cstates[HSW_EXT_CSTATE_COUNT] = {
    {
    .name = "PC9",
    .desc = N_("Processor Package C9"),
    - .desc = N_("Processor Package C2"),
    .id = PC9,
    .range = RANGE_PACKAGE,
    .get_count_percent = hsw_ext_get_count_percent,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 19:11    [W:2.585 / U:0.944 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site