cpufreq: qcom-cpufreq-hw: Revert adding cpufreq qos

[linux-2.6-microblaze.git] / drivers / cpufreq / qcom-cpufreq-hw.c

diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
index b75e615..eb54f7f 100644 (file)
--- a/drivers/cpufreq/qcom-cpufreq-hw.c
+++ b/drivers/cpufreq/qcom-cpufreq-hw.c
@@ -14,7 +14,6 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/pm_opp.h>
-#include <linux/pm_qos.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/units.h>
@@ -59,8 +58,6 @@ struct qcom_cpufreq_data {
        struct clk_hw cpu_clk;
 
        bool per_core_dcvs;
-
-       struct freq_qos_request throttle_freq_req;
 };
 
 static struct {
@@ -350,8 +347,6 @@ static void qcom_lmh_dcvs_notify(struct qcom_cpufreq_data *data)
 
        throttled_freq = freq_hz / HZ_PER_KHZ;
 
-       freq_qos_update_request(&data->throttle_freq_req, throttled_freq);
-
        /* Update thermal pressure (the boost frequencies are accepted) */
        arch_update_thermal_pressure(policy->related_cpus, throttled_freq);
 
@@ -444,14 +439,6 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
        if (data->throttle_irq < 0)
                return data->throttle_irq;
 
-       ret = freq_qos_add_request(&policy->constraints,
-                                  &data->throttle_freq_req, FREQ_QOS_MAX,
-                                  FREQ_QOS_MAX_DEFAULT_VALUE);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to add freq constraint (%d)\n", ret);
-               return ret;
-       }
-
        data->cancel_throttle = false;
        data->policy = policy;
 
@@ -518,7 +505,6 @@ static void qcom_cpufreq_hw_lmh_exit(struct qcom_cpufreq_data *data)
        if (data->throttle_irq <= 0)
                return;
 
-       freq_qos_remove_request(&data->throttle_freq_req);
        free_irq(data->throttle_irq, data);
 }