tools/power/turbostat: Rename uncore probing function

Rename intel_uncore_frequency_probe() to probe_intel_uncore_frequency()
to be consistent with other probing function names.

Probe uncore frequency right after probing cstates.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Len Brown <len.brown@intel.com>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 1bcaee6d0eadf210e1f59db7c4c12c8c05c6f6a3..a956a30d81dee94ddcbf5779dd4996433a2046ae 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -4378,7 +4378,7 @@ static void dump_sysfs_file(char *path)
        fprintf(outf, "%s: %s", strrchr(path, '/') + 1, cpuidle_buf);
 }
 
-static void intel_uncore_frequency_probe(void)
+static void probe_intel_uncore_frequency(void)
 {
        int i, j;
        char path[128];
@@ -5556,13 +5556,13 @@ void process_cpuid()
 
        probe_cstates();
 
+       probe_intel_uncore_frequency();
+
        if (platform->has_nhm_msrs)
                BIC_PRESENT(BIC_SMI);
 
        rapl_probe();
 
-       intel_uncore_frequency_probe();
-
        if (!access("/sys/class/drm/card0/power/rc6_residency_ms", R_OK))
                BIC_PRESENT(BIC_GFX_rc6);