commit 4d4cad2d842ad4e256e5ead533c25115fe927728
author John Stultz <john.stultz@linaro.org> Tue Aug 23 19:18:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 23 19:18:27 2016 +0000
tree 63bcffe56c034ee53ee180d9b2dac6c4cafc5d0a
parent 0bb1e6a0ecdb2e74e5c94ce088275da70c8ea604
parent cde94cb6660abdd270f6e1a06bc6f98eeb5bed67

power_hikey: Simplify init function by pulling calculate_max_freq() in am: 65de27c56b
am: cde94cb666

Change-Id: I428014832e6e3e48fefb5403940ae808c9deebc6

power/power_hikey.c

diff --git a/power/power_hikey.c b/power/power_hikey.c
index ea63916..c53603c 100644
--- a/power/power_hikey.c
+++ b/power/power_hikey.c
@@ -76,20 +76,10 @@
     close(fd);
 }
 
-static void calculate_max_cpu_freq() {
-    int32_t is_svelte = property_get_int32(SVELTE_PROP, 0);
-
-    if (is_svelte) {
-        char prop_buffer[PROPERTY_VALUE_MAX];
-        int len = property_get(SVELTE_MAX_FREQ_PROP, prop_buffer, LOW_POWER_MAX_FREQ);
-        max_cpu_freq = strndup(prop_buffer, len);
-        len = property_get(SVELTE_LOW_POWER_MAX_FREQ_PROP, prop_buffer, LOW_POWER_MAX_FREQ);
-        low_power_max_cpu_freq = strndup(prop_buffer, len);
-    }
-}
-
 static void power_init(struct power_module __unused *module)
 {
+    int32_t is_svelte = property_get_int32(SVELTE_PROP, 0);
+
     sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/timer_rate",
                 "20000");
     sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/timer_slack",
@@ -108,7 +98,14 @@
                 "1000000");
     sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/io_is_busy", "0");
 
-    calculate_max_cpu_freq();
+    if (is_svelte) {
+        char prop_buffer[PROPERTY_VALUE_MAX];
+        int len = property_get(SVELTE_MAX_FREQ_PROP, prop_buffer, LOW_POWER_MAX_FREQ);
+
+        max_cpu_freq = strndup(prop_buffer, len);
+        len = property_get(SVELTE_LOW_POWER_MAX_FREQ_PROP, prop_buffer, LOW_POWER_MAX_FREQ);
+        low_power_max_cpu_freq = strndup(prop_buffer, len);
+    }
 }
 
 static void power_set_interactive(struct power_module __unused *module, int on)