2 files changed, 10 insertions, 42 deletions

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index c503ec14765f..e1df376e709e 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -297,7 +297,6 @@ static struct attribute_group dbs_attr_group = {
 static void dbs_check_cpu(int cpu)
 {
         unsigned int idle_ticks, up_idle_ticks, down_idle_ticks;
-        unsigned int total_idle_ticks;
         unsigned int freq_step;
         unsigned int freq_down_sampling_rate;
         static int down_skip[NR_CPUS];
@@ -338,19 +337,12 @@ static void dbs_check_cpu(int cpu)
          */
 
         /* Check for frequency increase */
-        total_idle_ticks = get_cpu_idle_time(cpu);
-        idle_ticks = total_idle_ticks -
-                this_dbs_info->prev_cpu_idle_up;
-        this_dbs_info->prev_cpu_idle_up = total_idle_ticks;
-        
 
+        idle_ticks = UINT_MAX;
         for_each_cpu_mask(j, policy->cpus) {
-                unsigned int tmp_idle_ticks;
+                unsigned int tmp_idle_ticks, total_idle_ticks;
                 struct cpu_dbs_info_s *j_dbs_info;
 
-                if (j == cpu)
-                        continue;
-
                 j_dbs_info = &per_cpu(cpu_dbs_info, j);
                 /* Check for frequency increase */
                 total_idle_ticks = get_cpu_idle_time(j);
@@ -400,20 +392,12 @@ static void dbs_check_cpu(int cpu)
         if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor)
                 return;
 
-        total_idle_ticks = this_dbs_info->prev_cpu_idle_up;
-        idle_ticks = total_idle_ticks -
-                this_dbs_info->prev_cpu_idle_down;
-        this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
-
+        idle_ticks = UINT_MAX;
         for_each_cpu_mask(j, policy->cpus) {
-                unsigned int tmp_idle_ticks;
+                unsigned int tmp_idle_ticks, total_idle_ticks;
                 struct cpu_dbs_info_s *j_dbs_info;
 
-                if (j == cpu)
-                        continue;
-
                 j_dbs_info = &per_cpu(cpu_dbs_info, j);
-                /* Check for frequency increase */
                 total_idle_ticks = j_dbs_info->prev_cpu_idle_up;
                 tmp_idle_ticks = total_idle_ticks -
                         j_dbs_info->prev_cpu_idle_down;
@@ -432,7 +416,7 @@ static void dbs_check_cpu(int cpu)
         down_idle_ticks = (100 - dbs_tuners_ins.down_threshold) *
                         usecs_to_jiffies(freq_down_sampling_rate);
 
-        if (idle_ticks > down_idle_ticks ) {
+        if (idle_ticks > down_idle_ticks) {
                 /* if we are already at the lowest speed then break out early
                  * or if we 'cannot' reduce the speed as the user might want
                  * freq_step to be zero */
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index f239545ac1b8..0482bd49aba8 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -296,7 +296,6 @@ static struct attribute_group dbs_attr_group = {
 static void dbs_check_cpu(int cpu)
 {
         unsigned int idle_ticks, up_idle_ticks, down_idle_ticks;
-        unsigned int total_idle_ticks;
         unsigned int freq_down_step;
         unsigned int freq_down_sampling_rate;
         static int down_skip[NR_CPUS];
@@ -325,20 +324,12 @@ static void dbs_check_cpu(int cpu)
          */
 
         /* Check for frequency increase */
-        total_idle_ticks = get_cpu_idle_time(cpu);
-        idle_ticks = total_idle_ticks -
-                this_dbs_info->prev_cpu_idle_up;
-        this_dbs_info->prev_cpu_idle_up = total_idle_ticks;
-
+        idle_ticks = UINT_MAX;
         for_each_cpu_mask(j, policy->cpus) {
-                unsigned int tmp_idle_ticks;
+                unsigned int tmp_idle_ticks, total_idle_ticks;
                 struct cpu_dbs_info_s *j_dbs_info;
 
-                if (j == cpu)
-                        continue;
-
                 j_dbs_info = &per_cpu(cpu_dbs_info, j);
-                /* Check for frequency increase */
                 total_idle_ticks = get_cpu_idle_time(j);
                 tmp_idle_ticks = total_idle_ticks -
                         j_dbs_info->prev_cpu_idle_up;
@@ -376,18 +367,11 @@ static void dbs_check_cpu(int cpu)
         if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor)
                 return;
 
-        total_idle_ticks = this_dbs_info->prev_cpu_idle_up;
-        idle_ticks = total_idle_ticks -
-                this_dbs_info->prev_cpu_idle_down;
-        this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
-
+        idle_ticks = UINT_MAX;
         for_each_cpu_mask(j, policy->cpus) {
-                unsigned int tmp_idle_ticks;
+                unsigned int tmp_idle_ticks, total_idle_ticks;
                 struct cpu_dbs_info_s *j_dbs_info;
 
-                if (j == cpu)
-                        continue;
-
                 j_dbs_info = &per_cpu(cpu_dbs_info, j);
                 /* Check for frequency decrease */
                 total_idle_ticks = j_dbs_info->prev_cpu_idle_up;
@@ -408,7 +392,7 @@ static void dbs_check_cpu(int cpu)
         down_idle_ticks = (100 - dbs_tuners_ins.down_threshold) *
                 usecs_to_jiffies(freq_down_sampling_rate);
 
-        if (idle_ticks > down_idle_ticks ) {
+        if (idle_ticks > down_idle_ticks) {
                 /* if we are already at the lowest speed then break out early
                  * or if we 'cannot' reduce the speed as the user might want
                  * freq_step to be zero */