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>
This commit is contained in:

committed by
Rafael J. Wysocki

parent
2361be2366
commit
5070158804
@@ -254,7 +254,7 @@ static void longhaul_setstate(struct cpufreq_policy *policy,
|
||||
u32 bm_timeout = 1000;
|
||||
unsigned int dir = 0;
|
||||
|
||||
mults_index = longhaul_table[table_index].index;
|
||||
mults_index = longhaul_table[table_index].driver_data;
|
||||
/* Safety precautions */
|
||||
mult = mults[mults_index & 0x1f];
|
||||
if (mult == -1)
|
||||
@@ -487,7 +487,7 @@ static int __cpuinit longhaul_get_ranges(void)
|
||||
if (ratio > maxmult || ratio < minmult)
|
||||
continue;
|
||||
longhaul_table[k].frequency = calc_speed(ratio);
|
||||
longhaul_table[k].index = j;
|
||||
longhaul_table[k].driver_data = j;
|
||||
k++;
|
||||
}
|
||||
if (k <= 1) {
|
||||
@@ -508,8 +508,8 @@ static int __cpuinit longhaul_get_ranges(void)
|
||||
if (min_i != j) {
|
||||
swap(longhaul_table[j].frequency,
|
||||
longhaul_table[min_i].frequency);
|
||||
swap(longhaul_table[j].index,
|
||||
longhaul_table[min_i].index);
|
||||
swap(longhaul_table[j].driver_data,
|
||||
longhaul_table[min_i].driver_data);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -517,7 +517,7 @@ static int __cpuinit longhaul_get_ranges(void)
|
||||
|
||||
/* Find index we are running on */
|
||||
for (j = 0; j < k; j++) {
|
||||
if (mults[longhaul_table[j].index & 0x1f] == mult) {
|
||||
if (mults[longhaul_table[j].driver_data & 0x1f] == mult) {
|
||||
longhaul_index = j;
|
||||
break;
|
||||
}
|
||||
@@ -613,7 +613,7 @@ static void __cpuinit longhaul_setup_voltagescaling(void)
|
||||
pos = (speed - min_vid_speed) / kHz_step + minvid.pos;
|
||||
else
|
||||
pos = minvid.pos;
|
||||
longhaul_table[j].index |= mV_vrm_table[pos] << 8;
|
||||
longhaul_table[j].driver_data |= mV_vrm_table[pos] << 8;
|
||||
vid = vrm_mV_table[mV_vrm_table[pos]];
|
||||
printk(KERN_INFO PFX "f: %d kHz, index: %d, vid: %d mV\n",
|
||||
speed, j, vid.mV);
|
||||
@@ -656,12 +656,12 @@ static int longhaul_target(struct cpufreq_policy *policy,
|
||||
* this in hardware, C3 is old and we need to do this
|
||||
* in software. */
|
||||
i = longhaul_index;
|
||||
current_vid = (longhaul_table[longhaul_index].index >> 8);
|
||||
current_vid = (longhaul_table[longhaul_index].driver_data >> 8);
|
||||
current_vid &= 0x1f;
|
||||
if (table_index > longhaul_index)
|
||||
dir = 1;
|
||||
while (i != table_index) {
|
||||
vid = (longhaul_table[i].index >> 8) & 0x1f;
|
||||
vid = (longhaul_table[i].driver_data >> 8) & 0x1f;
|
||||
if (vid != current_vid) {
|
||||
longhaul_setstate(policy, i);
|
||||
current_vid = vid;
|
||||
|
Reference in New Issue
Block a user