cpufreq: rename index as driver_data in cpufreq_frequency_table

[linux-imx.git] / drivers / cpufreq / freq_table.c

diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index d7a79662e24c44bdb4c31c18530217b85255a019..f0d87412cc91742a73fa40a500b160387af9fb28 100644 (file)
--- 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;
 }