From 0b0225bf2f14ba8ff475157ca932f158cb7b62af Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Sat, 14 Oct 2017 18:03:00 +0530 Subject: [PATCH] LSK-ANDROID: cpufreq-dt: fix incorrect cherry-pick from android-4.4 Fix incorrect cherry-pick of Change-Id: Iec92d710c79d9c10d0bef1b617942185448fc214 ("ANDROID: cpufreq-dt: Set sane defaults for schedutil rate limits"), in lsk-v4.4-android topic branch. Fixes: lsk-v4.4-android commit d5a094a32657 ("ANDROID: cpufreq-dt: Set sane defaults for schedutil rate limits") Signed-off-by: Amit Pundir --- drivers/cpufreq/cpufreq-dt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c index ebe3567c2cda..a72ae98b4838 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -279,6 +279,13 @@ static int cpufreq_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = transition_latency; + /* + * Android: set default parameters for parity between schedutil and + * schedfreq + */ + policy->up_transition_delay_us = transition_latency / NSEC_PER_USEC; + policy->down_transition_delay_us = 50000; /* 50ms */ + return 0; out_free_cpufreq_table: @@ -340,13 +347,6 @@ static void cpufreq_ready(struct cpufreq_policy *policy) } } - /* - * Android: set default parameters for parity between schedutil and - * schedfreq - */ - policy->up_transition_delay_us = transition_latency / NSEC_PER_USEC; - policy->down_transition_delay_us = 50000; /* 50ms */ - of_node_put(np); }