diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-01 00:50:47 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-01 00:50:47 +0200 |
| commit | 89d4f82aa5ccf08dc28dc8b463844e6d7eed591b (patch) | |
| tree | 91e7e6ff2c5eda51bb48528244387f32c000433e /drivers/cpufreq/longhaul.c | |
| parent | cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost error (diff) | |
| parent | sh: clk: Use cpufreq_for_each_valid_entry macro for iteration (diff) | |
| download | linux-89d4f82aa5ccf08dc28dc8b463844e6d7eed591b.tar.xz linux-89d4f82aa5ccf08dc28dc8b463844e6d7eed591b.zip | |
Merge branch 'cpufreq-macros' into pm-cpufreq
Diffstat (limited to 'drivers/cpufreq/longhaul.c')
| -rw-r--r-- | drivers/cpufreq/longhaul.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c index 5c4369b5d834..c913906a719e 100644 --- a/drivers/cpufreq/longhaul.c +++ b/drivers/cpufreq/longhaul.c @@ -530,6 +530,7 @@ static int longhaul_get_ranges(void) static void longhaul_setup_voltagescaling(void) { + struct cpufreq_frequency_table *freq_pos; union msr_longhaul longhaul; struct mV_pos minvid, maxvid, vid; unsigned int j, speed, pos, kHz_step, numvscales; @@ -608,18 +609,16 @@ static void longhaul_setup_voltagescaling(void) /* Calculate kHz for one voltage step */ kHz_step = (highest_speed - min_vid_speed) / numvscales; - j = 0; - while (longhaul_table[j].frequency != CPUFREQ_TABLE_END) { - speed = longhaul_table[j].frequency; + cpufreq_for_each_entry(freq_pos, longhaul_table) { + speed = freq_pos->frequency; if (speed > min_vid_speed) pos = (speed - min_vid_speed) / kHz_step + minvid.pos; else pos = minvid.pos; - longhaul_table[j].driver_data |= mV_vrm_table[pos] << 8; + freq_pos->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); - j++; + speed, (int)(freq_pos - longhaul_table), vid.mV); } can_scale_voltage = 1; |