Revert "cpufreq: Prevent memory leak in cpufreq_stats on hotplug"

This reverts commit 80776c083a09f48e26d3d52cceefea1b38be8f9b.

diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index ca3f24c..00d73fc 100644 (file)
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -305,27 +305,6 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
        return 0;
 }
 
-static int cpufreq_stats_create_table_cpu(unsigned int cpu)
-{
-       struct cpufreq_policy *policy;
-       struct cpufreq_frequency_table *table;
-       int ret = -ENODEV;
-
-       policy = cpufreq_cpu_get(cpu);
-       if (!policy)
-               return -ENODEV;
-
-       table = cpufreq_frequency_get_table(cpu);
-       if (!table)
-               goto out;
-
-       ret = cpufreq_stats_create_table(policy, table);
-
-out:
-       cpufreq_cpu_put(policy);
-       return ret;
-}
-
 static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
                                               unsigned long action,
                                               void *hcpu)
@@ -337,14 +316,10 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
        case CPU_ONLINE_FROZEN:
                cpufreq_update_policy(cpu);
                break;
-       case CPU_DOWN_PREPARE:
-       case CPU_DOWN_PREPARE_FROZEN:
+       case CPU_DEAD:
+       case CPU_DEAD_FROZEN:
                cpufreq_stats_free_table(cpu);
                break;
-       case CPU_DOWN_FAILED:
-       case CPU_DOWN_FAILED_FROZEN:
-               cpufreq_stats_create_table_cpu(cpu);
-               break;
        }
        return NOTIFY_OK;
 }
@@ -352,7 +327,6 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
 static struct notifier_block cpufreq_stat_cpu_notifier __refdata =
 {
        .notifier_call = cpufreq_stat_cpu_callback,
-       .priority = 1,
 };
 
 static struct notifier_block notifier_policy_block = {