cpufreq: change '.set_boost' to act on one policy

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

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index d03f250..0128de3 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2532,34 +2532,29 @@ EXPORT_SYMBOL_GPL(cpufreq_update_limits);
 /*********************************************************************
  *               BOOST                                              *
  *********************************************************************/
-static int cpufreq_boost_set_sw(int state)
+static int cpufreq_boost_set_sw(struct cpufreq_policy *policy, int state)
 {
-       struct cpufreq_policy *policy;
-
-       for_each_active_policy(policy) {
-               int ret;
+       int ret;
 
-               if (!policy->freq_table)
-                       return -ENXIO;
+       if (!policy->freq_table)
+               return -ENXIO;
 
-               ret = cpufreq_frequency_table_cpuinfo(policy,
-                                                     policy->freq_table);
-               if (ret) {
-                       pr_err("%s: Policy frequency update failed\n",
-                              __func__);
-                       return ret;
-               }
-
-               ret = freq_qos_update_request(policy->max_freq_req, policy->max);
-               if (ret < 0)
-                       return ret;
+       ret = cpufreq_frequency_table_cpuinfo(policy, policy->freq_table);
+       if (ret) {
+               pr_err("%s: Policy frequency update failed\n", __func__);
+               return ret;
        }
 
+       ret = freq_qos_update_request(policy->max_freq_req, policy->max);
+       if (ret < 0)
+               return ret;
+
        return 0;
 }
 
 int cpufreq_boost_trigger_state(int state)
 {
+       struct cpufreq_policy *policy;
        unsigned long flags;
        int ret = 0;
 
@@ -2570,15 +2565,25 @@ int cpufreq_boost_trigger_state(int state)
        cpufreq_driver->boost_enabled = state;
        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
-       ret = cpufreq_driver->set_boost(state);
-       if (ret) {
-               write_lock_irqsave(&cpufreq_driver_lock, flags);
-               cpufreq_driver->boost_enabled = !state;
-               write_unlock_irqrestore(&cpufreq_driver_lock, flags);
-
-               pr_err("%s: Cannot %s BOOST\n",
-                      __func__, state ? "enable" : "disable");
+       get_online_cpus();
+       for_each_active_policy(policy) {
+               ret = cpufreq_driver->set_boost(policy, state);
+               if (ret)
+                       goto err_reset_state;
        }
+       put_online_cpus();
+
+       return 0;
+
+err_reset_state:
+       put_online_cpus();
+
+       write_lock_irqsave(&cpufreq_driver_lock, flags);
+       cpufreq_driver->boost_enabled = !state;
+       write_unlock_irqrestore(&cpufreq_driver_lock, flags);
+
+       pr_err("%s: Cannot %s BOOST\n",
+              __func__, state ? "enable" : "disable");
 
        return ret;
 }