cpufreq: stats: Use cpufreq_for_each_valid_entry macro for iteration
PATCH 3/20 cpufreq: stats: Use cpufreq_for_each_valid_entry macro for iteration
The cpufreq core supports the cpufreq_for_each_valid_entry macro helper for iteration over the cpufreq_frequency_table, so use it.
It should have no functional changes.
Signed-off-by Stratos Karafotis <[email protected]>
--- drivers/cpufreq/cpufreq_stats.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/cpufreq/cpufreq_stats.c +8 -14
@@ -182,11 +182,11 @@ static void cpufreq_stats_free_table(unsigned int cpu)static int __cpufreq_stats_create_table (struct cpufreq_policy *policy) { -unsigned int i, j, count =0 , ret =0 ; +unsigned int i, count =0 , ret =0 ;struct cpufreq_stats *stat;unsigned int alloc_size;unsigned int cpu = policy->cpu; -struct cpufreq_frequency_table *table; +struct cpufreq_frequency_table *pos, *table; table =cpufreq_frequency_get_table (cpu);if (unlikely (!table))
@@ -205,10 +205,7 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy) stat->cpu = cpu;per_cpu (cpufreq_stats_table, cpu) = stat; -for (i =0 ; table[i].frequency !=CPUFREQ_TABLE_END ; i++) { -unsigned int freq = table[i].frequency; -if (freq ==CPUFREQ_ENTRY_INVALID ) -continue ; +cpufreq_for_each_valid_entry (pos, table) { count++; }
@@ -228,15 +225,12 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy)#ifdef CONFIG_CPU_FREQ_STAT_DETAILS stat->trans_table = stat->freq_table + count;#endif - j =0 ; -for (i =0 ; table[i].frequency !=CPUFREQ_TABLE_END ; i++) { -unsigned int freq = table[i].frequency; -if (freq ==CPUFREQ_ENTRY_INVALID ) -continue ; -if (freq_table_get_index (stat, freq) ==-1 ) - stat->freq_table[j++] = freq; + i =0 ; +cpufreq_for_each_valid_entry (pos, table) { +if (freq_table_get_index (stat, pos->frequency) ==-1 ) + stat->freq_table[i++] = pos->frequency; } - stat->state_num = j; + stat->state_num = i;spin_lock (&cpufreq_stats_lock); stat->last_time =get_jiffies_64 (); stat->last_index =freq_table_get_index (stat, policy->cur);
Signature · 1 line
1.9.0
Viresh Kumar
maintainerQuoted 29 lines · Stratos Karafotis
The cpufreq core supports the
cpufreq_for_each_valid_entrymacro helper for iteration over thecpufreq_frequency_table, so use it.It should have no functional changes.
Signed-off-by Stratos Karafotis <[email protected]>--- drivers/cpufreq/cpufreq_stats.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)drivers/cpufreq/cpufreq_stats.c +2
-2@@ -182,11 +182,11 @@ static void cpufreq_stats_free_table(unsigned int cpu)static int __cpufreq_stats_create_table (struct cpufreq_policy *policy) { -unsigned int i, j, count =0 , ret =0 ; +unsigned int i, count =0 , ret =0 ;struct cpufreq_stats *stat;unsigned int alloc_size;unsigned int cpu = policy->cpu; -struct cpufreq_frequency_table *table; +struct cpufreq_frequency_table *pos, *table; table =cpufreq_frequency_get_table (cpu);if (unlikely (!table))
drivers/cpufreq/cpufreq_stats.c static int __cpufreq_stats_create_table(struct cpufreq_policy *policy) · line 210
Quoted 10 lines
drivers/cpufreq/cpufreq_stats.c +1
-4@@ -205,10 +205,7 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy) stat->cpu = cpu;per_cpu (cpufreq_stats_table, cpu) = stat; -for (i =0 ; table[i].frequency !=CPUFREQ_TABLE_END ; i++) { -unsigned int freq = table[i].frequency; -if (freq ==CPUFREQ_ENTRY_INVALID ) -continue ; +cpufreq_for_each_valid_entry (pos, table) { count++; }
Remove {} as well..