summaryrefslogtreecommitdiff
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-02-16 21:02:24 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-09 14:41:05 +0100
commita7f35cffb980f3aec75f74559a4320974c845b78 (patch)
treef8aeb31134e51fefbf596a633097422f9d5a6020 /drivers/cpufreq
parent07aa4402a009bc83194860e7869c491bab854d1c (diff)
downloadlwn-a7f35cffb980f3aec75f74559a4320974c845b78.tar.gz
lwn-a7f35cffb980f3aec75f74559a4320974c845b78.zip
cpufreq: ondemand: Simplify od_update() slightly
Drop some lines of code from od_update() by arranging the statements in there in a more logical way. No functional changes. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/cpufreq_ondemand.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index a3ee74577404..34e3a1be9971 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -175,14 +175,11 @@ static void od_update(struct cpufreq_policy *policy)
/* No longer fully busy, reset rate_mult */
policy_dbs->rate_mult = 1;
- if (!od_tuners->powersave_bias) {
- __cpufreq_driver_target(policy, freq_next,
- CPUFREQ_RELATION_C);
- return;
- }
-
- freq_next = od_ops.powersave_bias_target(policy, freq_next,
- CPUFREQ_RELATION_L);
+ if (od_tuners->powersave_bias)
+ freq_next = od_ops.powersave_bias_target(policy,
+ freq_next,
+ CPUFREQ_RELATION_L);
+
__cpufreq_driver_target(policy, freq_next, CPUFREQ_RELATION_C);
}
}