Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f605181a authored by Thomas Renninger's avatar Thomas Renninger Committed by Rafael J. Wysocki
Browse files

cpupower: Make idlestate usage unsigned 



Use unsigned int as the data type for some variables related to CPU
idle states which allows the code to be simplified slightly.

[rjw: Changelog]
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f991fae5

tools/power/cpupower/utils/cpuidle-info.c

+4 −14
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


static void cpuidle_cpu_output(unsigned int cpu, int verbose)

{

	int idlestates, idlestate;

	unsigned int idlestates, idlestate;

	char *tmp;



	printf(_ ("Analyzing CPU %d:\n"), cpu);
@@ -31,10 +31,8 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) 
	if (idlestates == 0) {

		printf(_("CPU %u: No idle states\n"), cpu);

		return;

	} else if (idlestates <= 0) {

		printf(_("CPU %u: Can't read idle state info\n"), cpu);

		return;

	}



	printf(_("Number of idle states: %d\n"), idlestates);

	printf(_("Available idle states:"));

	for (idlestate = 0; idlestate < idlestates; idlestate++) {
@@ -98,21 +96,13 @@ static void cpuidle_general_output(void) 
static void proc_cpuidle_cpu_output(unsigned int cpu)

{

	long max_allowed_cstate = 2000000000;

	int cstates, cstate;

	unsigned int cstate, cstates;



	cstates = sysfs_get_idlestate_count(cpu);

	if (cstates == 0) {

		/*

		 * Go on and print same useless info as you'd see with

		 * cat /proc/acpi/processor/../power

		 *	printf(_("CPU %u: No C-states available\n"), cpu);

		 *	return;

		 */

	} else if (cstates <= 0) {

		printf(_("CPU %u: Can't read C-state info\n"), cpu);

		printf(_("CPU %u: No C-states info\n"), cpu);

		return;

	}

	/* printf("Cstates: %d\n", cstates); */



	printf(_("active state:            C0\n"));

	printf(_("max_cstate:              C%u\n"), cstates-1);

tools/power/cpupower/utils/helpers/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ char *sysfs_get_idlestate_desc(unsigned int cpu, unsigned int idlestate) 
 * Negativ in error case

 * Zero if cpuidle does not export any C-states

 */

int sysfs_get_idlestate_count(unsigned int cpu)

unsigned int sysfs_get_idlestate_count(unsigned int cpu)

{

	char file[SYSFS_PATH_MAX];

	struct stat statbuf;

tools/power/cpupower/utils/helpers/sysfs.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ extern char *sysfs_get_idlestate_name(unsigned int cpu, 
				unsigned int idlestate);

extern char *sysfs_get_idlestate_desc(unsigned int cpu,

				unsigned int idlestate);

extern int sysfs_get_idlestate_count(unsigned int cpu);

extern unsigned int sysfs_get_idlestate_count(unsigned int cpu);



extern char *sysfs_get_cpuidle_governor(void);

extern char *sysfs_get_cpuidle_driver(void);