pass: Fix the build warning

This patch fixes the all of build warning.

Change-Id: I2425c949093735e9554be1bdad43bb3a7017513d
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/src/pass/pass-core.c b/src/pass/pass-core.c
index 7aa951985862e8adc94d4a851b6902b453699b4c..02e6c8792bc094a3da73ecd8c902c3aac4952f07 100644 (file)
--- a/src/pass/pass-core.c
+++ b/src/pass/pass-core.c
@@ -23,6 +23,7 @@
 
 #include "pass.h"
 #include "pass-gov.h"
+#include "pass-plugin.h"
 #include "pass-hotplug.h"
 
 #include "core/device-notifier.h"
@@ -331,9 +332,7 @@ static int pass_notifier_exit(struct pass_policy *policy)
 static void pass_hotplug_set_online(struct pass_policy *policy,
                                        unsigned int online)
 {
-       struct pass_table *table = policy->pass_table;
        struct pass_hotplug *hotplug = policy->hotplug;
-       int num_online;
        int i;
 
        if (!hotplug || online == hotplug->online)
@@ -342,11 +341,6 @@ static void pass_hotplug_set_online(struct pass_policy *policy,
        if (online > hotplug->max_online)
                online = hotplug->max_online;
 
-       if (online > hotplug->online)
-               num_online = online;
-       else
-               num_online = hotplug->online;
-
        for (i = 0 ; i < policy->cpufreq.num_nr_cpus; i++) {
                if (i < online)
                        set_cpu_online(hotplug->sequence[i], PASS_CPU_UP);
@@ -433,7 +427,6 @@ static int pass_governor_change_level(struct pass_policy *policy, int new_level)
        int limit_max_freq;
        int limit_max_cpu;
        int online;
-       int i;
 
        if (new_level > policy->max_level)
                new_level = policy->max_level;
@@ -621,7 +614,6 @@ static Eina_Bool pass_governor_core_timer(void *data)
        struct pass_policy *policy = (struct pass_policy *)data;
        static int count = 0;
        int level;
-       int online;
        int ret;
 
        if (!policy) {
@@ -733,9 +725,6 @@ static void pass_governor_start(struct pass_policy *policy)
  */
 static int pass_governor_init(struct pass_policy *policy)
 {
-       int max_level;
-       int ret;
-
        if(policy->governor->gov_timeout < 0) {
                _E("invalid timeout value [%d]!",
                        policy->governor->gov_timeout);

diff --git a/src/pass/pass-gov-step.c b/src/pass/pass-gov-step.c
index 61632bd5aa47894f1b07176d817e283731dc738b..48d565e44cecad6ca9ec0237bf94a0eb196294a9 100644 (file)
--- a/src/pass/pass-gov-step.c
+++ b/src/pass/pass-gov-step.c
@@ -42,7 +42,6 @@ int pass_step_governor(struct pass_policy *policy)
        int down_threshold = policy->down_threshold;
        int num_pass_gov = 0;
        int level = policy->curr_level;
-       int count = 0;
        int up_count = 0;
        int up_max_count = 0;
        int down_count = 0;

diff --git a/src/pass/pass-plugin.c b/src/pass/pass-plugin.c
index e54eb46a91f0f9863bf2e1c6463e20ce42ca1c5b..8b2faa60989c6fa8809b80e6236ac993aac0d70e 100644 (file)
--- a/src/pass/pass-plugin.c
+++ b/src/pass/pass-plugin.c
@@ -24,6 +24,7 @@
 #include "pass.h"
 #include "pass-plugin.h"
 
+#include "core/common.h"
 #include "core/config-parser.h"
 
 #define BUFF_MAX                       255
@@ -37,8 +38,7 @@ int get_pass_cpu_stats(struct pass_policy *policy)
        struct pass_cpu_stats *stats = policy->pass_cpu_stats;
        char str[BUFF_MAX];
        FILE *fp_stats = NULL;
-       int i, j;
-       int ret = 1;
+       int i, j, ret;
 
        if (!policy || !policy->cluster.path_load_table || !stats) {
                _E("invalid parameter of structure pass_cpu_stats");
@@ -49,96 +49,34 @@ int get_pass_cpu_stats(struct pass_policy *policy)
        if (fp_stats == NULL)
                return -EIO;
 
-       fgets(str, BUFF_MAX, fp_stats);
+       /* Read the title and drop the buffer because it is not used */
+       if (!fgets(str, BUFF_MAX, fp_stats))
+               return -EIO;
+
        for (i = 0; i < policy->num_pass_cpu_stats; i++) {
                ret = fscanf(fp_stats, "%lld %d %d %d",
                        &stats[i].time,
                        &stats[i].freq,
                        &stats[i].freq_new,
                        &stats[i].nr_runnings);
+               if (ret < 0)
+                       return -EIO;
 
-               for (j = 0; j < policy->cpufreq.num_nr_cpus; j++)
+               for (j = 0; j < policy->cpufreq.num_nr_cpus; j++) {
                        ret = fscanf(fp_stats, "%d", &stats[i].load[j]);
+                       if (ret < 0)
+                               return -EIO;
+               }
        }
        fclose(fp_stats);
 
        return 0;
 }
 
-/*
- * Helper function
- * - Read from sysfs entry
- * - Write to sysfs entry
- */
-static int sys_read_buf(char *file, char *buf)
-{
-       int fd;
-       int r;
-       int ret = 0;
-
-       fd = open(file, O_RDONLY);
-       if (fd == -1)
-               return -ENOENT;
-
-       r = read(fd, buf, BUFF_MAX);
-       if ((r >= 0) && (r < BUFF_MAX))
-               buf[r] = '\0';
-       else
-               ret = -EIO;
-
-       close(fd);
-
-       return ret;
-}
-
-static int sys_write_buf(char *file, char *buf)
-{
-       int fd;
-       int r;
-       int ret = 0;
-
-       fd = open(file, O_WRONLY);
-       if (fd == -1)
-               return -1;
-
-       r = write(fd, buf, strlen(buf));
-       if (r < 0)
-               ret = -EIO;
-
-       close(fd);
-
-       return ret;
-}
-
-static int sys_get_int(char *fname, int *val)
-{
-       char buf[BUFF_MAX];
-
-       if (sys_read_buf(fname, buf) == 0) {
-               *val = atoi(buf);
-               return 0;
-       } else {
-               *val = -1;
-               return -1;
-       }
-}
-
-static int sys_set_int(char *fname, int val)
-{
-       char buf[BUFF_MAX];
-       int r = -1;
-       snprintf(buf, sizeof(buf), "%d", val);
-
-       if (sys_write_buf(fname, buf) == 0)
-               r = 0;
-
-       return r;
-}
-
 /*
  * Get/Set maximum cpu frequency
  */
-int get_cpufreq_scaling_max_freq(int cpu)
+int get_cpufreq_scaling_max_freq(unsigned int cpu)
 {
        char path[BUFF_MAX];
        int online;
@@ -156,7 +94,7 @@ int get_cpufreq_scaling_max_freq(int cpu)
        return online;
 }
 
-int set_cpufreq_scaling_max_freq(int cpu, int freq)
+int set_cpufreq_scaling_max_freq(unsigned int cpu, int freq)
 {
        char path[BUFF_MAX];
        int ret;
@@ -175,7 +113,7 @@ int set_cpufreq_scaling_max_freq(int cpu, int freq)
        return 0;
 }
 
-int get_cpufreq_scaling_min_freq(int cpu)
+int get_cpufreq_scaling_min_freq(unsigned int cpu)
 {
        char path[BUFF_MAX];
        int online;
@@ -193,7 +131,7 @@ int get_cpufreq_scaling_min_freq(int cpu)
        return online;
 }
 
-int set_cpufreq_scaling_min_freq(int cpu, int freq)
+int set_cpufreq_scaling_min_freq(unsigned int cpu, int freq)
 {
        char path[BUFF_MAX];
        int ret;
@@ -212,7 +150,7 @@ int set_cpufreq_scaling_min_freq(int cpu, int freq)
        return 0;
 }
 
-int get_cpu_online(int cpu)
+int get_cpu_online(unsigned int cpu)
 {
        char path[BUFF_MAX];
        int online;
@@ -228,7 +166,7 @@ int get_cpu_online(int cpu)
 
        return online;
 }
-int set_cpu_online(int cpu, int online)
+int set_cpu_online(unsigned int cpu, unsigned int online)
 {
        char path[BUFF_MAX];
        int ret;
@@ -286,8 +224,6 @@ static int pass_parse_scenario(struct parse_result *result, void *user_data,
 {
        struct pass_policy *policy = user_data;
        struct pass_scenario_policy *scenario = &policy->scenario;
-       char section_name[BUFF_MAX];
-       int i;
 
        if (!policy && !scenario && !result)
                return 0;
@@ -353,8 +289,6 @@ static int  pass_parse_cpufreq_level(struct parse_result *result,
                                    void *user_data, int level)
 {
        struct pass_policy *policy = user_data;
-       char section_name[BUFF_MAX];
-       int i, ret;
 
        if (!result)
                return 0;
@@ -409,8 +343,6 @@ static int  pass_parse_cpufreq_level(struct parse_result *result,
 static int pass_parse_core(struct parse_result *result, void *user_data)
 {
        struct pass_policy *policy = user_data;
-       char section_name[BUFF_MAX];
-       int i, ret;
 
        if (!result)
                return 0;
@@ -420,9 +352,9 @@ static int pass_parse_core(struct parse_result *result, void *user_data)
 
        if (MATCH(result->name, "pass_compatible")) {
                char compatible[BUFF_MAX];
-               int len;
+               int len, ret;
 
-               ret = sys_read_buf(PROC_DT_COMPATIBLE, compatible);
+               ret = sys_get_str(PROC_DT_COMPATIBLE, compatible);
                if (ret < 0)
                        return -EEXIST;
 
@@ -479,7 +411,7 @@ static int pass_load_config(struct parse_result *result, void *user_data)
        char section_name[BUFF_MAX];
        int level = PASS_UNUSED;
        int index = PASS_UNUSED;
-       int i, ret;
+       int ret;
 
        if (!result)
                return 0;
@@ -707,8 +639,6 @@ static int  pass_parse_cpu_cluster_data(struct parse_result *result,
                                    void *user_data, int id)
 {
        struct pass_cluster *cluster = user_data;
-       char section_name[BUFF_MAX];
-       int i, ret;
 
        if (!result)
                return 0;

diff --git a/src/pass/pass-plugin.h b/src/pass/pass-plugin.h
index 0e35608c07ca2eabe31a9c5faada248be6f71d53..34b46aebb91a8f7a4c5948f58ebb40449de7fe50 100644 (file)
--- a/src/pass/pass-plugin.h
+++ b/src/pass/pass-plugin.h
@@ -26,15 +26,16 @@ int get_pass_cpu_stats(struct pass_policy *policy);
 
 int get_pass_table(struct pass_policy *policy, char *pass_conf_path);
 void put_pass_table(struct pass_policy *policy);
+int get_pass_cluster(struct pass_cluster *cluster, char *pass_conf_path);
 
-int get_cpufreq_scaling_max_freq(int cpu);
-int set_cpufreq_scaling_max_freq(int cpu, int freq);
+int get_cpufreq_scaling_max_freq(unsigned int cpu);
+int set_cpufreq_scaling_max_freq(unsigned int cpu, int freq);
 
-int get_cpufreq_scaling_min_freq(int cpu);
-int set_cpufreq_scaling_min_freq(int cpu, int freq);
+int get_cpufreq_scaling_min_freq(unsigned int cpu);
+int set_cpufreq_scaling_min_freq(unsigned int cpu, int freq);
 
-int get_cpu_online(int);
-int set_cpu_online(int, int);
+int get_cpu_online(unsigned int);
+int set_cpu_online(unsigned int, unsigned int);
 
 int get_num_cpus(void);
 

diff --git a/src/pass/pass.c b/src/pass/pass.c
index d725728d7da982b4dd232838e389c8eddb48eaca..c5e7557a876f6d095f267bb900f0fd46bee8c77c 100644 (file)
--- a/src/pass/pass.c
+++ b/src/pass/pass.c
@@ -241,7 +241,7 @@ static void pass_init(void *data2)
        ret = get_pass_cluster(&cluster, "/etc/deviced/pass.conf");
        if (ret < 0) {
                _E("cannot parse /etc/deviced/pass.conf\n");
-               return -1;
+               return;
        }
 
        policy_list = malloc(sizeof(struct pass_policy)
@@ -297,10 +297,14 @@ static void pass_init(void *data2)
  */
 static void pass_exit(void *data)
 {
-       int i;
+       int i, ret;
 
        for (i = 0; i < cluster.num_cpu_clusters; i++) {
-               pass_cluster_exit(&policy_list[i]);
+               ret = pass_cluster_exit(&policy_list[i]);
+               if (ret < 0) {
+                       _E("cannot exit the pass cluster");
+               }
+       }
 }
 
 static const struct device_ops pass_device_ops = {