From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 16 Feb 2016 20:02:24 +0000 (+0100)
Subject: cpufreq: ondemand: Simplify od_update() slightly
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a7f35cffb980f3aec75f74559a4320974c845b78;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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);
 	}
 }