[PATCH 10/11] tools/power turbostat: fix various build warnings

From: Arnaldo Carvalho de Melo
Date: Wed Mar 02 2016 - 17:18:35 EST


From: Colin Ian King <colin.king@xxxxxxxxxxxxx>

When building with gcc 6 we're getting various build warnings that just
require some trivial function declaration and call fixes:

turbostat.c: In function âdump_cstate_pstate_config_infoâ:
turbostat.c:1973:1: warning: type of âfamilyâ defaults to âintâ
dump_cstate_pstate_config_info(family, model)
turbostat.c:1973:1: warning: type of âmodelâ defaults to âintâ
turbostat.c: In function âget_tdpâ:
turbostat.c:2145:8: warning: type of âmodelâ defaults to âintâ
double get_tdp(model)
turbostat.c: In function âperf_limit_reasons_probeâ:
turbostat.c:2259:6: warning: type of âfamilyâ defaults to âintâ
void perf_limit_reasons_probe(family, model)
turbostat.c:2259:6: warning: type of âmodelâ defaults to âintâ

Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-wbicer8n0s9qe6ql8h9x478e@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/power/x86/turbostat/turbostat.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 0dac7e05a6ac..3fa94e291d16 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -1970,7 +1970,7 @@ int has_config_tdp(unsigned int family, unsigned int model)
}

static void
-dump_cstate_pstate_config_info(family, model)
+dump_cstate_pstate_config_info(unsigned int family, unsigned int model)
{
if (!do_nhm_platform_info)
return;
@@ -2142,7 +2142,7 @@ int print_perf_limit(struct thread_data *t, struct core_data *c, struct pkg_data
#define RAPL_POWER_GRANULARITY 0x7FFF /* 15 bit power granularity */
#define RAPL_TIME_GRANULARITY 0x3F /* 6 bit time granularity */

-double get_tdp(model)
+double get_tdp(unsigned int model)
{
unsigned long long msr;

@@ -2256,7 +2256,7 @@ void rapl_probe(unsigned int family, unsigned int model)
return;
}

-void perf_limit_reasons_probe(family, model)
+void perf_limit_reasons_probe(unsigned int family, unsigned int model)
{
if (!genuine_intel)
return;
@@ -2792,7 +2792,7 @@ void process_cpuid()
perf_limit_reasons_probe(family, model);

if (debug)
- dump_cstate_pstate_config_info();
+ dump_cstate_pstate_config_info(family, model);

if (has_skl_msrs(family, model))
calculate_tsc_tweak();
--
2.5.0