cpufreq: Remove cpufreq_frequency_get_table()

Most of the callers of cpufreq_frequency_get_table() already have the
pointer to a valid 'policy' structure and they don't really need to go
through the per-cpu variable first and then a check to validate the
frequency, in order to find the freq-table for the policy.

Directly use the policy->freq_table field instead for them.

Only one user of that API is left after above changes, cpu_cooling.c and
it accesses the freq_table in a racy way as the policy can get freed in
between.

Fix it by using cpufreq_cpu_get() properly.

Since there are no more users of cpufreq_frequency_get_table() left, get
rid of it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Javi Merino <javi.merino@arm.com> (cpu_cooling.c)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 14 insertions, 24 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index c6a14ba239a2..cc252eecc45a 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -126,15 +126,6 @@ struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy)
 }
 EXPORT_SYMBOL_GPL(get_governor_parent_kobj);
 
-struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu)
-{
-        struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
-
-        return policy && !policy_is_inactive(policy) ?
-                policy->freq_table : NULL;
-}
-EXPORT_SYMBOL_GPL(cpufreq_frequency_get_table);
-
 static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
 {
         u64 idle_time;
@@ -1950,7 +1941,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
         if (!cpufreq_driver->target_index)
                 return -EINVAL;
 
-        freq_table = cpufreq_frequency_get_table(policy->cpu);
+        freq_table = policy->freq_table;
         if (unlikely(!freq_table)) {
                 pr_err("%s: Unable to find freq_table\n", __func__);
                 return -EINVAL;
@@ -2345,26 +2336,25 @@ static struct notifier_block __refdata cpufreq_cpu_notifier = {
  *********************************************************************/
 static int cpufreq_boost_set_sw(int state)
 {
-        struct cpufreq_frequency_table *freq_table;
         struct cpufreq_policy *policy;
         int ret = -EINVAL;
 
         for_each_active_policy(policy) {
-                freq_table = cpufreq_frequency_get_table(policy->cpu);
-                if (freq_table) {
-                        ret = cpufreq_frequency_table_cpuinfo(policy,
-                                                        freq_table);
-                        if (ret) {
-                                pr_err("%s: Policy frequency update failed\n",
-                                       __func__);
-                                break;
-                        }
+                if (!policy->freq_table)
+                        continue;
 
-                        down_write(&policy->rwsem);
-                        policy->user_policy.max = policy->max;
-                        cpufreq_governor_limits(policy);
-                        up_write(&policy->rwsem);
+                ret = cpufreq_frequency_table_cpuinfo(policy,
+                                                      policy->freq_table);
+                if (ret) {
+                        pr_err("%s: Policy frequency update failed\n",
+                               __func__);
+                        break;
                 }
+
+                down_write(&policy->rwsem);
+                policy->user_policy.max = policy->max;
+                cpufreq_governor_limits(policy);
+                up_write(&policy->rwsem);
         }
 
         return ret;