cpufreq: speedstep: 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 speedstep 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/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index 4fa5adf16c7014817485784f47d0e650d95e3344..a1fb735685dbfbb4bbae28fd9e8940df5adffdb8 100644 (file)
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -394,9 +394,9 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
 
        policy->cpuinfo.transition_latency = 10000;
                                                /* 10uS transition latency */
+       policy->freq_table = per_cpu(centrino_model, policy->cpu)->op_points;
 
-       return cpufreq_table_validate_and_show(policy,
-               per_cpu(centrino_model, policy->cpu)->op_points);
+       return 0;
 }
 
 static int centrino_cpu_exit(struct cpufreq_policy *policy)

diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c
index 0412a246a785bc8b6d14e3e5408994afe87cf552..fbbcb88db061652a35a573538e8cd51fabe6fa6b 100644 (file)
--- a/drivers/cpufreq/speedstep-ich.c
+++ b/drivers/cpufreq/speedstep-ich.c
@@ -304,7 +304,9 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
        if (gf.ret)
                return gf.ret;
 
-       return cpufreq_table_validate_and_show(policy, speedstep_freqs);
+       policy->freq_table = speedstep_freqs;
+
+       return 0;
 }
 
 

diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c
index d23f24ccff38ef59dbb23880bf2492be4acb300c..01fe70dae20b66eb4d66f5066bee159bc0341b3c 100644 (file)
--- a/drivers/cpufreq/speedstep-smi.c
+++ b/drivers/cpufreq/speedstep-smi.c
@@ -266,7 +266,9 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
                        pr_debug("workaround worked.\n");
        }
 
-       return cpufreq_table_validate_and_show(policy, speedstep_freqs);
+       policy->freq_table = speedstep_freqs;
+
+       return 0;
 }
 
 static unsigned int speedstep_get(unsigned int cpu)