Merge branch 'pm-cpufreq-thermal' into pm-cpufreq

* pm-cpufreq-thermal:
  cpu_cooling: Remove static-power related documentation
  cpu_cooling: Drop static-power related stuff
  cpu_cooling: Keep only one of_cpufreq*cooling_register() helper
  cpu_cooling: Remove unused cpufreq_power_cooling_register()
  cpu_cooling: Make of_cpufreq_power_cooling_register() parse DT

1 files changed, 1 insertions, 21 deletions

diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c
index b783919f063d..8c04dddd3c28 100644
--- a/drivers/cpufreq/mediatek-cpufreq.c
+++ b/drivers/cpufreq/mediatek-cpufreq.c
@@ -310,28 +310,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
 static void mtk_cpufreq_ready(struct cpufreq_policy *policy)
 {
         struct mtk_cpu_dvfs_info *info = policy->driver_data;
-        struct device_node *np = of_node_get(info->cpu_dev->of_node);
-        u32 capacitance = 0;
 
-        if (WARN_ON(!np))
-                return;
-
-        if (of_find_property(np, "#cooling-cells", NULL)) {
-                of_property_read_u32(np, DYNAMIC_POWER, &capacitance);
-
-                info->cdev = of_cpufreq_power_cooling_register(np,
-                                                policy, capacitance, NULL);
-
-                if (IS_ERR(info->cdev)) {
-                        dev_err(info->cpu_dev,
-                                "running cpufreq without cooling device: %ld\n",
-                                PTR_ERR(info->cdev));
-
-                        info->cdev = NULL;
-                }
-        }
-
-        of_node_put(np);
+        info->cdev = of_cpufreq_cooling_register(policy);
 }
 
 static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)