diff options
author | Jon Medhurst <tixy@linaro.org> | 2014-02-06 05:50:30 +0000 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-06 13:43:17 +0400 |
commit | a69451fd61bde44e0a4eb7c91cd828d29a1895c6 (patch) | |
tree | ae0f6c2c7b09acb0675a9838310a8be65db88f2e | |
parent | 032c1d49c8e5c96f5c31fff4cade947a407056e2 (diff) |
Revert "cpufreq: Prevent memory leak in cpufreq_stats on hotplug"
This reverts commit 32d3498d047d71b706e7a55803203a969cc2bacf.
Conflicts:
drivers/cpufreq/cpufreq_stats.c
Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r-- | drivers/cpufreq/cpufreq_stats.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index e9ddcd2ed637..5793e1447fb1 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c @@ -347,58 +347,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 cpufreq_stat_cpu_callback(struct notifier_block *nfb, - unsigned long action, - void *hcpu) -{ - unsigned int cpu = (unsigned long)hcpu; - - switch (action) { - case CPU_DOWN_PREPARE: - cpufreq_stats_free_sysfs(cpu); - break; - case CPU_DEAD: - cpufreq_stats_free_table(cpu); - break; - case CPU_UP_CANCELED_FROZEN: - cpufreq_stats_free_sysfs(cpu); - 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; -} - -/* priority=1 so this will get called before cpufreq_remove_dev */ -static struct notifier_block cpufreq_stat_cpu_notifier __refdata = { - .notifier_call = cpufreq_stat_cpu_callback, - .priority = 1, -}; - static struct notifier_block notifier_policy_block = { .notifier_call = cpufreq_stat_notifier_policy }; |