1 files changed, 31 insertions, 33 deletions

diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index 08e7bbcf6d73..1632981c4b25 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -21,22 +21,19 @@
 int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
                                     struct cpufreq_frequency_table *table)
 {
+        struct cpufreq_frequency_table *pos;
         unsigned int min_freq = ~0;
         unsigned int max_freq = 0;
-        unsigned int i;
+        unsigned int freq;
 
-        for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
-                unsigned int freq = table[i].frequency;
-                if (freq == CPUFREQ_ENTRY_INVALID) {
-                        pr_debug("table entry %u is invalid, skipping\n", i);
+        cpufreq_for_each_valid_entry(pos, table) {
+                freq = pos->frequency;
 
-                        continue;
-                }
                 if (!cpufreq_boost_enabled()
-                    && (table[i].flags & CPUFREQ_BOOST_FREQ))
+                    && (pos->flags & CPUFREQ_BOOST_FREQ))
                         continue;
 
-                pr_debug("table entry %u: %u kHz\n", i, freq);
+                pr_debug("table entry %u: %u kHz\n", (int)(pos - table), freq);
                 if (freq < min_freq)
                         min_freq = freq;
                 if (freq > max_freq)
@@ -57,7 +54,8 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_cpuinfo);
 int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
                                    struct cpufreq_frequency_table *table)
 {
-        unsigned int next_larger = ~0, freq, i = 0;
+        struct cpufreq_frequency_table *pos;
+        unsigned int freq, next_larger = ~0;
         bool found = false;
 
         pr_debug("request for verification of policy (%u - %u kHz) for cpu %u\n",
@@ -65,9 +63,9 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
 
         cpufreq_verify_within_cpu_limits(policy);
 
-        for (; freq = table[i].frequency, freq != CPUFREQ_TABLE_END; i++) {
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        cpufreq_for_each_valid_entry(pos, table) {
+                freq = pos->frequency;
+
                 if ((freq >= policy->min) && (freq <= policy->max)) {
                         found = true;
                         break;
@@ -118,7 +116,8 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                 .driver_data = ~0,
                 .frequency = 0,
         };
-        unsigned int i;
+        struct cpufreq_frequency_table *pos;
+        unsigned int freq, i = 0;
 
         pr_debug("request for target %u kHz (relation: %u) for cpu %u\n",
                                         target_freq, relation, policy->cpu);
@@ -132,15 +131,19 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                 break;
         }
 
-        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) {
+                freq = pos->frequency;
+
+                i = pos - table;
                 if ((freq < policy->min) || (freq > policy->max))
                         continue;
+                if (freq == target_freq) {
+                        optimal.driver_data = i;
+                        break;
+                }
                 switch (relation) {
                 case CPUFREQ_RELATION_H:
-                        if (freq <= target_freq) {
+                        if (freq < target_freq) {
                                 if (freq >= optimal.frequency) {
                                         optimal.frequency = freq;
                                         optimal.driver_data = i;
@@ -153,7 +156,7 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                         }
                         break;
                 case CPUFREQ_RELATION_L:
-                        if (freq >= target_freq) {
+                        if (freq > target_freq) {
                                 if (freq <= optimal.frequency) {
                                         optimal.frequency = freq;
                                         optimal.driver_data = i;
@@ -184,8 +187,7 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_target);
 int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,
                 unsigned int freq)
 {
-        struct cpufreq_frequency_table *table;
-        int i;
+        struct cpufreq_frequency_table *pos, *table;
 
         table = cpufreq_frequency_get_table(policy->cpu);
         if (unlikely(!table)) {
@@ -193,10 +195,9 @@ int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,
                 return -ENOENT;
         }
 
-        for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                if (table[i].frequency == freq)
-                        return i;
-        }
+        cpufreq_for_each_valid_entry(pos, table)
+                if (pos->frequency == freq)
+                        return pos - table;
 
         return -EINVAL;
 }
@@ -208,16 +209,13 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_get_index);
 static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf,
                                     bool show_boost)
 {
-        unsigned int i = 0;
         ssize_t count = 0;
-        struct cpufreq_frequency_table *table = policy->freq_table;
+        struct cpufreq_frequency_table *pos, *table = policy->freq_table;
 
         if (!table)
                 return -ENODEV;
 
-        for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
-                if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        cpufreq_for_each_valid_entry(pos, table) {
                 /*
                  * show_boost = true and driver_data = BOOST freq
                  * display BOOST freqs
@@ -229,10 +227,10 @@ static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf,
                  * show_boost = false and driver_data != BOOST freq
                  * display NON BOOST freqs
                  */
-                if (show_boost ^ (table[i].flags & CPUFREQ_BOOST_FREQ))
+                if (show_boost ^ (pos->flags & CPUFREQ_BOOST_FREQ))
                         continue;
 
-                count += sprintf(&buf[count], "%d ", table[i].frequency);
+                count += sprintf(&buf[count], "%d ", pos->frequency);
         }
         count += sprintf(&buf[count], "\n");