diff options
-rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index fe565ee43757..ac0bbf2d234f 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c | |||
@@ -333,7 +333,7 @@ static void dbs_check_cpu(int cpu) | |||
333 | { | 333 | { |
334 | unsigned int idle_ticks, up_idle_ticks, down_idle_ticks; | 334 | unsigned int idle_ticks, up_idle_ticks, down_idle_ticks; |
335 | unsigned int tmp_idle_ticks, total_idle_ticks; | 335 | unsigned int tmp_idle_ticks, total_idle_ticks; |
336 | unsigned int freq_step; | 336 | unsigned int freq_target; |
337 | unsigned int freq_down_sampling_rate; | 337 | unsigned int freq_down_sampling_rate; |
338 | struct cpu_dbs_info_s *this_dbs_info = &per_cpu(cpu_dbs_info, cpu); | 338 | struct cpu_dbs_info_s *this_dbs_info = &per_cpu(cpu_dbs_info, cpu); |
339 | struct cpufreq_policy *policy; | 339 | struct cpufreq_policy *policy; |
@@ -383,13 +383,13 @@ static void dbs_check_cpu(int cpu) | |||
383 | if (this_dbs_info->requested_freq == policy->max) | 383 | if (this_dbs_info->requested_freq == policy->max) |
384 | return; | 384 | return; |
385 | 385 | ||
386 | freq_step = (dbs_tuners_ins.freq_step * policy->max) / 100; | 386 | freq_target = (dbs_tuners_ins.freq_step * policy->max) / 100; |
387 | 387 | ||
388 | /* max freq cannot be less than 100. But who knows.... */ | 388 | /* max freq cannot be less than 100. But who knows.... */ |
389 | if (unlikely(freq_step == 0)) | 389 | if (unlikely(freq_target == 0)) |
390 | freq_step = 5; | 390 | freq_target = 5; |
391 | 391 | ||
392 | this_dbs_info->requested_freq += freq_step; | 392 | this_dbs_info->requested_freq += freq_target; |
393 | if (this_dbs_info->requested_freq > policy->max) | 393 | if (this_dbs_info->requested_freq > policy->max) |
394 | this_dbs_info->requested_freq = policy->max; | 394 | this_dbs_info->requested_freq = policy->max; |
395 | 395 | ||
@@ -425,19 +425,19 @@ static void dbs_check_cpu(int cpu) | |||
425 | /* | 425 | /* |
426 | * if we are already at the lowest speed then break out early | 426 | * if we are already at the lowest speed then break out early |
427 | * or if we 'cannot' reduce the speed as the user might want | 427 | * or if we 'cannot' reduce the speed as the user might want |
428 | * freq_step to be zero | 428 | * freq_target to be zero |
429 | */ | 429 | */ |
430 | if (this_dbs_info->requested_freq == policy->min | 430 | if (this_dbs_info->requested_freq == policy->min |
431 | || dbs_tuners_ins.freq_step == 0) | 431 | || dbs_tuners_ins.freq_step == 0) |
432 | return; | 432 | return; |
433 | 433 | ||
434 | freq_step = (dbs_tuners_ins.freq_step * policy->max) / 100; | 434 | freq_target = (dbs_tuners_ins.freq_step * policy->max) / 100; |
435 | 435 | ||
436 | /* max freq cannot be less than 100. But who knows.... */ | 436 | /* max freq cannot be less than 100. But who knows.... */ |
437 | if (unlikely(freq_step == 0)) | 437 | if (unlikely(freq_target == 0)) |
438 | freq_step = 5; | 438 | freq_target = 5; |
439 | 439 | ||
440 | this_dbs_info->requested_freq -= freq_step; | 440 | this_dbs_info->requested_freq -= freq_target; |
441 | if (this_dbs_info->requested_freq < policy->min) | 441 | if (this_dbs_info->requested_freq < policy->min) |
442 | this_dbs_info->requested_freq = policy->min; | 442 | this_dbs_info->requested_freq = policy->min; |
443 | 443 | ||