Thermal: exynos: fix cooling state translation

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Amit Daniel kachhap <amit.daniel@samsung.com>

2 files changed, 13 insertions, 22 deletions

diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 9e208d300647..e03891b03c9b 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -196,6 +196,17 @@ static int get_property(unsigned int cpu, unsigned long input,
         return -EINVAL;
 }
 
+unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq)
+{
+        unsigned int val;
+
+        if (get_property(cpu, (unsigned long)freq, &val, GET_LEVEL))
+                return THERMAL_CSTATE_INVALID;
+        return (unsigned long)val;
+}
+
+EXPORT_SYMBOL(cpufreq_cooling_get_level);
+
 /**
  * get_cpu_frequency - get the absolute value of frequency from level.
  * @cpu: cpu for which frequency is fetched.
diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c
index 46568c078dee..541257888c3e 100644
--- a/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/exynos_thermal.c
@@ -242,26 +242,6 @@ static int exynos_get_crit_temp(struct thermal_zone_device *thermal,
         return ret;
 }
 
-static int exynos_get_frequency_level(unsigned int cpu, unsigned int freq)
-{
-        int i = 0, ret = -EINVAL;
-        struct cpufreq_frequency_table *table = NULL;
-#ifdef CONFIG_CPU_FREQ
-        table = cpufreq_frequency_get_table(cpu);
-#endif
-        if (!table)
-                return ret;
-
-        while (table[i].frequency != CPUFREQ_TABLE_END) {
-                if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
-                        continue;
-                if (table[i].frequency == freq)
-                        return i;
-                i++;
-        }
-        return ret;
-}
-
 /* Bind callback functions for thermal zone */
 static int exynos_bind(struct thermal_zone_device *thermal,
                         struct thermal_cooling_device *cdev)
@@ -288,8 +268,8 @@ static int exynos_bind(struct thermal_zone_device *thermal,
         /* Bind the thermal zone to the cpufreq cooling device */
         for (i = 0; i < tab_size; i++) {
                 clip_data = (struct freq_clip_table *)&(tab_ptr[i]);
-                level = exynos_get_frequency_level(0, clip_data->freq_clip_max);
-                if (level < 0)
+                level = cpufreq_cooling_get_level(0, clip_data->freq_clip_max);
+                if (level == THERMAL_CSTATE_INVALID)
                         return 0;
                 switch (GET_ZONE(i)) {
                 case MONITOR_ZONE: