aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2018-02-26 00:09:08 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-03-20 07:07:52 -0400
commit2d28b03686846f3ca62135c6f06b93e77752d581 (patch)
tree544b3ffd81f54c8316f41421030cbafcdbff78b0
parent31f4b7a86b53cfa3b6bcef67cda62708b596cd91 (diff)
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>
-rw-r--r--drivers/cpufreq/speedstep-centrino.c4
-rw-r--r--drivers/cpufreq/speedstep-ich.c4
-rw-r--r--drivers/cpufreq/speedstep-smi.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index 4fa5adf16c70..a1fb735685db 100644
--- 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)
394 394
395 policy->cpuinfo.transition_latency = 10000; 395 policy->cpuinfo.transition_latency = 10000;
396 /* 10uS transition latency */ 396 /* 10uS transition latency */
397 policy->freq_table = per_cpu(centrino_model, policy->cpu)->op_points;
397 398
398 return cpufreq_table_validate_and_show(policy, 399 return 0;
399 per_cpu(centrino_model, policy->cpu)->op_points);
400} 400}
401 401
402static int centrino_cpu_exit(struct cpufreq_policy *policy) 402static int centrino_cpu_exit(struct cpufreq_policy *policy)
diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c
index 0412a246a785..fbbcb88db061 100644
--- 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)
304 if (gf.ret) 304 if (gf.ret)
305 return gf.ret; 305 return gf.ret;
306 306
307 return cpufreq_table_validate_and_show(policy, speedstep_freqs); 307 policy->freq_table = speedstep_freqs;
308
309 return 0;
308} 310}
309 311
310 312
diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c
index d23f24ccff38..01fe70dae20b 100644
--- 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)
266 pr_debug("workaround worked.\n"); 266 pr_debug("workaround worked.\n");
267 } 267 }
268 268
269 return cpufreq_table_validate_and_show(policy, speedstep_freqs); 269 policy->freq_table = speedstep_freqs;
270
271 return 0;
270} 272}
271 273
272static unsigned int speedstep_get(unsigned int cpu) 274static unsigned int speedstep_get(unsigned int cpu)