Commit 3403e89f authored by Zhang Rui's avatar Zhang Rui Committed by Len Brown
Browse files

tools/power turbostat: Remove add_msr_perf_counter_() 



As the only caller of add_msr_perf_counter_(), add_msr_perf_counter()
just gives extra debug output on top. There is no need to keep both
functions.

Remove add_msr_perf_counter_() and move all the logic to
add_msr_perf_counter().

No functional change.

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

tools/power/x86/turbostat/turbostat.c

+8 −12
Original line number Diff line number Diff line
@@ -8052,30 +8052,26 @@ int add_cstate_perf_counter(int cpu, struct cstate_counter_info_t *cci, const st 
	return ret;

}



int add_msr_perf_counter_(int cpu, struct msr_counter_info_t *cci, const struct msr_counter_arch_info *cai)

int add_msr_perf_counter(int cpu, struct msr_counter_info_t *cci, const struct msr_counter_arch_info *cai)

{

	int ret = -1;



	if (no_perf)

		return -1;



	const unsigned int type = read_perf_type(cai->perf_subsys);

	const unsigned int config = read_perf_config(cai->perf_subsys, cai->perf_name);



	const int fd_counter = open_perf_counter(cpu, type, config, cci->fd_perf, PERF_FORMAT_GROUP);

	ret = open_perf_counter(cpu, type, config, cci->fd_perf, PERF_FORMAT_GROUP);



	if (fd_counter == -1)

		return -1;

	if (ret == -1)

		goto end;



	/* If it's the first counter opened, make it a group descriptor */

	if (cci->fd_perf == -1)

		cci->fd_perf = fd_counter;



	return fd_counter;

}



int add_msr_perf_counter(int cpu, struct msr_counter_info_t *cci, const struct msr_counter_arch_info *cai)

{

	int ret = add_msr_perf_counter_(cpu, cci, cai);

		cci->fd_perf = ret;



end:

	if (debug)

		fprintf(stderr, "%s: %s/%s: %d (cpu: %d)\n", __func__, cai->perf_subsys, cai->perf_name, ret, cpu);