Revert "tools: cpupower: fix return checks for sysfs_get_idlestate_count()"

prarit · rafaeljw · commit 2a813f1aaaf0 · 2014-12-14T22:14:16.000+01:00
This reverts commit 16b7c27. My previous commit 16b7c27 ("tools: cpupower: fix return checks for sysfs_get_idlestate_count()") was not correct. After looking at the changelog for cpupower I noticed that Thomas had changed the return of sysfs_get_idlestate_count() to an unsigned int to simplify the code. The problem is really that both he (in his original change) and I (in my new change) missed the obvious that sysfs_get_idlestate_count() can't return -ENODEV. It should just return 0 for "no c-states". Fixes: 16b7c27 (tools: cpupower: fix return checks for ...) Signed-off-by: Prarit Bhargava <prarit@redhat.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/tools/power/cpupower/utils/cpuidle-info.c b/tools/power/cpupower/utils/cpuidle-info.c
@@ -22,13 +22,13 @@
 
 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);
 
 	idlestates = sysfs_get_idlestate_count(cpu);
-	if (idlestates < 1) {
+	if (idlestates == 0) {
 		printf(_("CPU %u: No idle states\n"), cpu);
 		return;
 	}
@@ -100,10 +100,10 @@ static void cpuidle_general_output(void)
 static void proc_cpuidle_cpu_output(unsigned int cpu)
 {
 	long max_allowed_cstate = 2000000000;
-	int cstate, cstates;
+	unsigned int cstate, cstates;
 
 	cstates = sysfs_get_idlestate_count(cpu);
-	if (cstates < 1) {
+	if (cstates == 0) {
 		printf(_("CPU %u: No C-states info\n"), cpu);
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@`
`22`	`22`
`23`	`23`	`static void cpuidle_cpu_output(unsigned int cpu, int verbose)`
`24`	`24`	`{`
`25`		`- int idlestates, idlestate;`
	`25`	`+ unsigned int idlestates, idlestate;`
`26`	`26`	`char *tmp;`
`27`	`27`
`28`	`28`	`printf(_ ("Analyzing CPU %d:\n"), cpu);`
`29`	`29`
`30`	`30`	`idlestates = sysfs_get_idlestate_count(cpu);`
`31`		`- if (idlestates < 1) {`
	`31`	`+ if (idlestates == 0) {`
`32`	`32`	`printf(_("CPU %u: No idle states\n"), cpu);`
`33`	`33`	`return;`
`34`	`34`	`}`
`@@ -100,10 +100,10 @@ static void cpuidle_general_output(void)`
`100`	`100`	`static void proc_cpuidle_cpu_output(unsigned int cpu)`
`101`	`101`	`{`
`102`	`102`	`long max_allowed_cstate = 2000000000;`
`103`		`- int cstate, cstates;`
	`103`	`+ unsigned int cstate, cstates;`
`104`	`104`
`105`	`105`	`cstates = sysfs_get_idlestate_count(cpu);`
`106`		`- if (cstates < 1) {`
	`106`	`+ if (cstates == 0) {`
`107`	`107`	`printf(_("CPU %u: No C-states info\n"), cpu);`
`108`	`108`	`return;`
`109`	`109`	`}`