summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2017-04-25 15:57:15 +0530
committerEduardo Valentin <edubezval@gmail.com>2017-05-27 17:32:28 -0700
commit55d852931319d2e3ccde86cd426405231ce6c6ac (patch)
treef5de819c0b18a12bd323160554c7f62dadb27aed /drivers/thermal
parent4d753aa7b6279e4b7d338947a434689962f430d1 (diff)
downloadblackbird-op-linux-55d852931319d2e3ccde86cd426405231ce6c6ac.tar.gz
blackbird-op-linux-55d852931319d2e3ccde86cd426405231ce6c6ac.zip
cpufreq: create cpufreq_table_count_valid_entries()
We need such a routine at two places already, lets create one. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Tested-by: Lukasz Luba <lukasz.luba@arm.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/cpu_cooling.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 58e58065b650..55ff45c1e917 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -739,7 +739,6 @@ __cpufreq_cooling_register(struct device_node *np,
struct thermal_cooling_device *cdev;
struct cpufreq_cooling_device *cpufreq_cdev;
char dev_name[THERMAL_NAME_LENGTH];
- struct cpufreq_frequency_table *pos, *table;
unsigned int freq, i, num_cpus;
int ret;
struct thermal_cooling_device_ops *cooling_ops;
@@ -750,9 +749,10 @@ __cpufreq_cooling_register(struct device_node *np,
return ERR_PTR(-EINVAL);
}
- table = policy->freq_table;
- if (!table) {
- pr_debug("%s: CPUFreq table not found\n", __func__);
+ i = cpufreq_table_count_valid_entries(policy);
+ if (!i) {
+ pr_debug("%s: CPUFreq table not found or has no valid entries\n",
+ __func__);
return ERR_PTR(-ENODEV);
}
@@ -777,20 +777,16 @@ __cpufreq_cooling_register(struct device_node *np,
goto free_time_in_idle;
}
- /* Find max levels */
- cpufreq_for_each_valid_entry(pos, table)
- cpufreq_cdev->max_level++;
+ /* max_level is an index, not a counter */
+ cpufreq_cdev->max_level = i - 1;
- cpufreq_cdev->freq_table = kmalloc(sizeof(*cpufreq_cdev->freq_table) *
- cpufreq_cdev->max_level, GFP_KERNEL);
+ cpufreq_cdev->freq_table = kmalloc(sizeof(*cpufreq_cdev->freq_table) * i,
+ GFP_KERNEL);
if (!cpufreq_cdev->freq_table) {
cdev = ERR_PTR(-ENOMEM);
goto free_time_in_idle_timestamp;
}
- /* max_level is an index, not a counter */
- cpufreq_cdev->max_level--;
-
cpumask_copy(&cpufreq_cdev->allowed_cpus, policy->related_cpus);
if (capacitance) {
@@ -816,7 +812,7 @@ __cpufreq_cooling_register(struct device_node *np,
/* Fill freq-table in descending order of frequencies */
for (i = 0, freq = -1; i <= cpufreq_cdev->max_level; i++) {
- freq = find_next_max(table, freq);
+ freq = find_next_max(policy->freq_table, freq);
cpufreq_cdev->freq_table[i] = freq;
/* Warn for duplicate entries */
OpenPOWER on IntegriCloud