TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 qoirq driver.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Viresh Kumar
2018-02-26 10:39:01 +05:30
committed by Rafael J. Wysocki
parent 8ed5a219d0
commit 5ab508bebf
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/cpufreq/qoriq-cpufreq.c
View File

@@ -165,7 +165,7 @@ static void freq_table_sort(struct cpufreq_frequency_table *freq_table,
static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy) static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)
{ {
struct device_node *np; struct device_node *np;
int i, count, ret; int i, count;
u32 freq; u32 freq;
struct clk *clk; struct clk *clk;
const struct clk_hw *hwclk; const struct clk_hw *hwclk;
@@ -209,14 +209,7 @@ static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)
freq_table_redup(table, count); freq_table_redup(table, count);
freq_table_sort(table, count); freq_table_sort(table, count);
table[i].frequency = CPUFREQ_TABLE_END; table[i].frequency = CPUFREQ_TABLE_END;
policy->freq_table = table;
/* set the min and max frequency properly */
ret = cpufreq_table_validate_and_show(policy, table);
if (ret) {
pr_err("invalid frequency table: %d\n", ret);
goto err_nomem1;
}
data->table = table; data->table = table;
/* update ->cpus if we have cluster, no harm if not */ /* update ->cpus if we have cluster, no harm if not */
@@ -232,8 +225,6 @@ static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)
return 0; return 0;
err_nomem1:
kfree(table);
err_pclk: err_pclk:
kfree(data->pclk); kfree(data->pclk);
err_nomem2: err_nomem2: