cpufreq: powernow: Don't validate the frequency table twice

The cpufreq core is already validating the CPU frequency table after
calling the ->init() callback of the cpufreq drivers and the drivers
don't need to do the same anymore. Though they need to set the
policy->freq_table field directly from the ->init() callback now.

Stop validating the frequency table from powernow driver.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c
index dedd2568e8528290f622d52149d87d36dc164100..8a8ea68611a84f39344929d2461a874581f5c0e2 100644 (file)
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@ -214,8 +214,9 @@ have_busfreq:
 
        /* cpuinfo and default policy values */
        policy->cpuinfo.transition_latency = 500000;
+       policy->freq_table = clock_ratio;
 
-       return cpufreq_table_validate_and_show(policy, clock_ratio);
+       return 0;
 }
 
 

diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 302e9ce793a0171e491e0374eee3a7fc1dac63ac..d6cb052b0a7570e3f1b3e16612166baf3827a909 100644 (file)
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -639,8 +639,9 @@ static int powernow_cpu_init(struct cpufreq_policy *policy)
 
        policy->cpuinfo.transition_latency =
                cpufreq_scale(2000000UL, fsb, latency);
+       policy->freq_table = powernow_table;
 
-       return cpufreq_table_validate_and_show(policy, powernow_table);
+       return 0;
 }
 
 static int powernow_cpu_exit(struct cpufreq_policy *policy)

diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 782a8c2a359d0d5ac624e6e0d2de2861f6ee6e91..fb77b39a4ce36b21047c744e906e163bf2e34fe0 100644 (file)
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1076,15 +1076,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)
 
        cpumask_copy(pol->cpus, topology_core_cpumask(pol->cpu));
        data->available_cores = pol->cpus;
-
-       /* min/max the cpu is capable of */
-       if (cpufreq_table_validate_and_show(pol, data->powernow_table)) {
-               pr_err(FW_BUG "invalid powernow_table\n");
-               powernow_k8_cpu_exit_acpi(data);
-               kfree(data->powernow_table);
-               kfree(data);
-               return -EINVAL;
-       }
+       pol->freq_table = data->powernow_table;
 
        pr_debug("cpu_init done, current fid 0x%x, vid 0x%x\n",
                data->currfid, data->currvid);