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: Thomas Renninger <trenn@suse.de>
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
index 8145af5f93a674b861f907d05639b06bb637ffb6..edd5dba3e2499f19a8caaa981cba127d38b3e41c 100644 (file)
--- a/tools/power/cpupower/utils/cpuidle-info.c
+++ b/tools/power/cpupower/utils/cpuidle-info.c
@@ -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);

diff --git a/tools/power/cpupower/utils/helpers/sysfs.c b/tools/power/cpupower/utils/helpers/sysfs.c
index 38ab91629463f31e2e81bad84f977a5421a03afe..891f6710d026014dfd075d34c455ea47362a07c9 100644 (file)
--- a/tools/power/cpupower/utils/helpers/sysfs.c
+++ b/tools/power/cpupower/utils/helpers/sysfs.c
@@ -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;

diff --git a/tools/power/cpupower/utils/helpers/sysfs.h b/tools/power/cpupower/utils/helpers/sysfs.h
index 8cb797bbceb0b565a5f698e68c71b856dbe2b37c..0401a97a4cab8de8bd4c75854151c7bf0b753dc2 100644 (file)
--- a/tools/power/cpupower/utils/helpers/sysfs.h
+++ b/tools/power/cpupower/utils/helpers/sysfs.h
@@ -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);