cpufreq: rename index as driver_data in cpufreq_frequency_table

The "index" field of struct cpufreq_frequency_table was never an
index and isn't used at all by the cpufreq core.  It only is useful
for cpufreq drivers for their internal purposes.

Many people nowadays blindly set it in ascending order with the
assumption that the core will use it, which is a mistake.

Rename it to "driver_data" as that's what its purpose is. All of its
users are updated accordingly.

[rjw: Changelog]
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index d7a79662e24c..f0d87412cc91 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -34,8 +34,8 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
 
                         continue;
                 }
-                pr_debug("table entry %u: %u kHz, %u index\n",
-                                        i, freq, table[i].index);
+                pr_debug("table entry %u: %u kHz, %u driver_data\n",
+                                        i, freq, table[i].driver_data);
                 if (freq < min_freq)
                         min_freq = freq;
                 if (freq > max_freq)
@@ -97,11 +97,11 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                                    unsigned int *index)
 {
         struct cpufreq_frequency_table optimal = {
-                .index = ~0,
+                .driver_data = ~0,
                 .frequency = 0,
         };
         struct cpufreq_frequency_table suboptimal = {
-                .index = ~0,
+                .driver_data = ~0,
                 .frequency = 0,
         };
         unsigned int i;
@@ -129,12 +129,12 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                         if (freq <= target_freq) {
                                 if (freq >= optimal.frequency) {
                                         optimal.frequency = freq;
-                                        optimal.index = i;
+                                        optimal.driver_data = i;
                                 }
                         } else {
                                 if (freq <= suboptimal.frequency) {
                                         suboptimal.frequency = freq;
-                                        suboptimal.index = i;
+                                        suboptimal.driver_data = i;
                                 }
                         }
                         break;
@@ -142,26 +142,26 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                         if (freq >= target_freq) {
                                 if (freq <= optimal.frequency) {
                                         optimal.frequency = freq;
-                                        optimal.index = i;
+                                        optimal.driver_data = i;
                                 }
                         } else {
                                 if (freq >= suboptimal.frequency) {
                                         suboptimal.frequency = freq;
-                                        suboptimal.index = i;
+                                        suboptimal.driver_data = i;
                                 }
                         }
                         break;
                 }
         }
-        if (optimal.index > i) {
-                if (suboptimal.index > i)
+        if (optimal.driver_data > i) {
+                if (suboptimal.driver_data > i)
                         return -EINVAL;
-                *index = suboptimal.index;
+                *index = suboptimal.driver_data;
         } else
-                *index = optimal.index;
+                *index = optimal.driver_data;
 
         pr_debug("target is %u (%u kHz, %u)\n", *index, table[*index].frequency,
-                table[*index].index);
+                table[*index].driver_data);
 
         return 0;
 }