aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2018-04-03 06:07:38 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-10 02:39:55 -0400
commitd983af9864b273e2fa19f564e6fa80d67638e539 (patch)
tree014a4c12d4700e85b523e1ea540d6685d14312af
parent8913315e9459b146e5888ab5138e10daa061b885 (diff)
cpufreq: SCMI: 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 SCMI driver. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/cpufreq/scmi-cpufreq.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
index 959a1dbe3835..b4dbc77459b6 100644
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@ -159,13 +159,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
159 priv->domain_id = handle->perf_ops->device_domain_id(cpu_dev); 159 priv->domain_id = handle->perf_ops->device_domain_id(cpu_dev);
160 160
161 policy->driver_data = priv; 161 policy->driver_data = priv;
162 162 policy->freq_table = freq_table;
163 ret = cpufreq_table_validate_and_show(policy, freq_table);
164 if (ret) {
165 dev_err(cpu_dev, "%s: invalid frequency table: %d\n", __func__,
166 ret);
167 goto out_free_cpufreq_table;
168 }
169 163
170 /* SCMI allows DVFS request for any domain from any CPU */ 164 /* SCMI allows DVFS request for any domain from any CPU */
171 policy->dvfs_possible_from_any_cpu = true; 165 policy->dvfs_possible_from_any_cpu = true;
@@ -179,8 +173,6 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
179 policy->fast_switch_possible = true; 173 policy->fast_switch_possible = true;
180 return 0; 174 return 0;
181 175
182out_free_cpufreq_table:
183 dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
184out_free_priv: 176out_free_priv:
185 kfree(priv); 177 kfree(priv);
186out_free_opp: 178out_free_opp: