1 files changed, 13 insertions, 25 deletions

diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 5793e1447fb1..eb214d83ad6b 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -180,27 +180,25 @@ static void cpufreq_stats_free_table(unsigned int cpu)
         cpufreq_cpu_put(policy);
 }
 
-static int __cpufreq_stats_create_table(struct cpufreq_policy *policy,
-                struct cpufreq_frequency_table *table)
+static int __cpufreq_stats_create_table(struct cpufreq_policy *policy)
 {
         unsigned int i, j, count = 0, ret = 0;
         struct cpufreq_stats *stat;
-        struct cpufreq_policy *current_policy;
         unsigned int alloc_size;
         unsigned int cpu = policy->cpu;
+        struct cpufreq_frequency_table *table;
+
+        table = cpufreq_frequency_get_table(cpu);
+        if (unlikely(!table))
+                return 0;
+
         if (per_cpu(cpufreq_stats_table, cpu))
                 return -EBUSY;
         stat = kzalloc(sizeof(*stat), GFP_KERNEL);
         if ((stat) == NULL)
                 return -ENOMEM;
 
-        current_policy = cpufreq_cpu_get(cpu);
-        if (current_policy == NULL) {
-                ret = -EINVAL;
-                goto error_get_fail;
-        }
-
-        ret = sysfs_create_group(&current_policy->kobj, &stats_attr_group);
+        ret = sysfs_create_group(&policy->kobj, &stats_attr_group);
         if (ret)
                 goto error_out;
 
@@ -223,7 +221,7 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy,
         stat->time_in_state = kzalloc(alloc_size, GFP_KERNEL);
         if (!stat->time_in_state) {
                 ret = -ENOMEM;
-                goto error_out;
+                goto error_alloc;
         }
         stat->freq_table = (unsigned int *)(stat->time_in_state + count);
 
@@ -243,11 +241,10 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy,
         stat->last_time = get_jiffies_64();
         stat->last_index = freq_table_get_index(stat, policy->cur);
         spin_unlock(&cpufreq_stats_lock);
-        cpufreq_cpu_put(current_policy);
         return 0;
+error_alloc:
+        sysfs_remove_group(&policy->kobj, &stats_attr_group);
 error_out:
-        cpufreq_cpu_put(current_policy);
-error_get_fail:
         kfree(stat);
         per_cpu(cpufreq_stats_table, cpu) = NULL;
         return ret;
@@ -256,7 +253,6 @@ error_get_fail:
 static void cpufreq_stats_create_table(unsigned int cpu)
 {
         struct cpufreq_policy *policy;
-        struct cpufreq_frequency_table *table;
 
         /*
          * "likely(!policy)" because normally cpufreq_stats will be registered
@@ -266,9 +262,7 @@ static void cpufreq_stats_create_table(unsigned int cpu)
         if (likely(!policy))
                 return;
 
-        table = cpufreq_frequency_get_table(policy->cpu);
-        if (likely(table))
-                __cpufreq_stats_create_table(policy, table);
+        __cpufreq_stats_create_table(policy);
 
         cpufreq_cpu_put(policy);
 }
@@ -291,20 +285,14 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
 {
         int ret = 0;
         struct cpufreq_policy *policy = data;
-        struct cpufreq_frequency_table *table;
-        unsigned int cpu = policy->cpu;
 
         if (val == CPUFREQ_UPDATE_POLICY_CPU) {
                 cpufreq_stats_update_policy_cpu(policy);
                 return 0;
         }
 
-        table = cpufreq_frequency_get_table(cpu);
-        if (!table)
-                return 0;
-
         if (val == CPUFREQ_CREATE_POLICY)
-                ret = __cpufreq_stats_create_table(policy, table);
+                ret = __cpufreq_stats_create_table(policy);
         else if (val == CPUFREQ_REMOVE_POLICY)
                 __cpufreq_stats_free_table(policy);