Commit 6cb13609 authored by Zhang Rui's avatar Zhang Rui
Browse files

tools/power/turbostat: Rename rapl probing function 



Rename rapl_probe() to probe_rapl() to be consistent with other probing
function names.

Probe rapl after probing uncore frequency.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarLen Brown <len.brown@intel.com>
parent 622c8f23

tools/power/x86/turbostat/turbostat.c

+4 −4
Original line number Diff line number Diff line
@@ -4865,11 +4865,11 @@ void rapl_probe_amd(void) 
}



/*

 * rapl_probe()

 * probe_rapl()

 *

 * sets rapl_power_units, rapl_energy_units, rapl_time_units

 */

void rapl_probe(void)

void probe_rapl(void)

{

	if (!platform->rapl_msrs)

		return;
@@ -5558,11 +5558,11 @@ void process_cpuid() 


	probe_intel_uncore_frequency();



	probe_rapl();



	if (platform->has_nhm_msrs)

		BIC_PRESENT(BIC_SMI);



	rapl_probe();



	if (!access("/sys/class/drm/card0/power/rc6_residency_ms", R_OK))

		BIC_PRESENT(BIC_GFX_rc6);