Skip to content

Commit 7e5705c

Browse files
nathanchanceshuahkh
authored andcommitted
tools/power/cpupower: Fix initializer override in hsw_ext_cstates
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: 7ee767b ("cpupower: Add Haswell family 0x45 specific idle monitor to show PC8,9,10 states") Link: ClangBuiltLinux#718 Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Shuah Khan <[email protected]>
1 parent 54ecb8f commit 7e5705c

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ static cstate_t hsw_ext_cstates[HSW_EXT_CSTATE_COUNT] = {
3939
{
4040
.name = "PC9",
4141
.desc = N_("Processor Package C9"),
42-
.desc = N_("Processor Package C2"),
4342
.id = PC9,
4443
.range = RANGE_PACKAGE,
4544
.get_count_percent = hsw_ext_get_count_percent,

0 commit comments

Comments
 (0)