]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[CPUFREQ] Fix -Wshadow warning in conservative governor.
authorDave Jones <davej@redhat.com>
Wed, 30 Jul 2008 16:59:56 +0000 (12:59 -0400)
committerDave Jones <davej@redhat.com>
Fri, 8 Aug 2008 20:00:48 +0000 (16:00 -0400)
drivers/cpufreq/cpufreq_conservative.c:336:15: warning: symbol 'freq_step' shadows an earlier one

Just rename the local variable.

Signed-off-by: Dave Jones <davej@redhat.com>
drivers/cpufreq/cpufreq_conservative.c

index fe565ee437575731124f3488a1962602bec51ee2..ac0bbf2d234f3c72ecb5e6d781bc25afeef1afae 100644 (file)
@@ -333,7 +333,7 @@ static void dbs_check_cpu(int cpu)
 {
        unsigned int idle_ticks, up_idle_ticks, down_idle_ticks;
        unsigned int tmp_idle_ticks, total_idle_ticks;
-       unsigned int freq_step;
+       unsigned int freq_target;
        unsigned int freq_down_sampling_rate;
        struct cpu_dbs_info_s *this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
        struct cpufreq_policy *policy;
@@ -383,13 +383,13 @@ static void dbs_check_cpu(int cpu)
                if (this_dbs_info->requested_freq == policy->max)
                        return;
 
-               freq_step = (dbs_tuners_ins.freq_step * policy->max) / 100;
+               freq_target = (dbs_tuners_ins.freq_step * policy->max) / 100;
 
                /* max freq cannot be less than 100. But who knows.... */
-               if (unlikely(freq_step == 0))
-                       freq_step = 5;
+               if (unlikely(freq_target == 0))
+                       freq_target = 5;
 
-               this_dbs_info->requested_freq += freq_step;
+               this_dbs_info->requested_freq += freq_target;
                if (this_dbs_info->requested_freq > policy->max)
                        this_dbs_info->requested_freq = policy->max;
 
@@ -425,19 +425,19 @@ static void dbs_check_cpu(int cpu)
                /*
                 * 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
+                * freq_target to be zero
                 */
                if (this_dbs_info->requested_freq == policy->min
                                || dbs_tuners_ins.freq_step == 0)
                        return;
 
-               freq_step = (dbs_tuners_ins.freq_step * policy->max) / 100;
+               freq_target = (dbs_tuners_ins.freq_step * policy->max) / 100;
 
                /* max freq cannot be less than 100. But who knows.... */
-               if (unlikely(freq_step == 0))
-                       freq_step = 5;
+               if (unlikely(freq_target == 0))
+                       freq_target = 5;
 
-               this_dbs_info->requested_freq -= freq_step;
+               this_dbs_info->requested_freq -= freq_target;
                if (this_dbs_info->requested_freq < policy->min)
                        this_dbs_info->requested_freq = policy->min;