AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 16:10:49 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal: cpu_cooling: Use cpufreq_for_each_valid_entry macro for iteration

Browse Source 
The cpufreq core now supports the cpufreq_for_each_valid_entry macro
helper for iteration over the cpufreq_frequency_table, so use it.

Also remove the redundant !! operator.

It should have no functional changes.

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Stratos Karafotis 2014-04-25 23:16:39 +03:00 committed by Rafael J. Wysocki
parent 4966ee4037
commit 3c84ef3af7
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/thermal/cpu_cooling.c
View File

@ -144,11 +144,11 @@ static int get_property(unsigned int cpu, unsigned long input,
unsigned int *output, unsigned int *output,
enum cpufreq_cooling_property property) enum cpufreq_cooling_property property)
{ {
int i, j; int i;
unsigned long max_level = 0, level = 0; unsigned long max_level = 0, level = 0;
unsigned int freq = CPUFREQ_ENTRY_INVALID; unsigned int freq = CPUFREQ_ENTRY_INVALID;
int descend = -1; int descend = -1;
struct cpufreq_frequency_table *table = struct cpufreq_frequency_table *pos, *table =
cpufreq_frequency_get_table(cpu); cpufreq_frequency_get_table(cpu);
if (!output) if (!output)
@ -157,20 +157,16 @@ static int get_property(unsigned int cpu, unsigned long input,
if (!table) if (!table)
return -EINVAL; return -EINVAL;
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { cpufreq_for_each_valid_entry(pos, table) {
/* ignore invalid entries */
if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
continue;
/* ignore duplicate entry */ /* ignore duplicate entry */
if (freq == table[i].frequency) if (freq == pos->frequency)
continue; continue;
/* get the frequency order */ /* get the frequency order */
if (freq != CPUFREQ_ENTRY_INVALID && descend == -1) if (freq != CPUFREQ_ENTRY_INVALID && descend == -1)
descend = !!(freq > table[i].frequency); descend = freq > pos->frequency;
freq = table[i].frequency; freq = pos->frequency;
max_level++; max_level++;
} }
@ -190,29 +186,26 @@ static int get_property(unsigned int cpu, unsigned long input,
if (property == GET_FREQ) if (property == GET_FREQ)
level = descend ? input : (max_level - input); level = descend ? input : (max_level - input);
for (i = 0, j = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { i = 0;
/* ignore invalid entry */ cpufreq_for_each_valid_entry(pos, table) {
if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
continue;
/* ignore duplicate entry */ /* ignore duplicate entry */
if (freq == table[i].frequency) if (freq == pos->frequency)
continue; continue;
/* now we have a valid frequency entry */ /* now we have a valid frequency entry */
freq = table[i].frequency; freq = pos->frequency;
if (property == GET_LEVEL && (unsigned int)input == freq) { if (property == GET_LEVEL && (unsigned int)input == freq) {
/* get level by frequency */ /* get level by frequency */
*output = descend ? j : (max_level - j); *output = descend ? i : (max_level - i);
return 0; return 0;
} }
if (property == GET_FREQ && level == j) { if (property == GET_FREQ && level == i) {
/* get frequency by level */ /* get frequency by level */
*output = freq; *output = freq;
return 0; return 0;
} }
j++; i++;
} }
return -EINVAL; return -EINVAL;