diff options
author | Dave Jones <davej@redhat.com> | 2006-02-28 00:43:23 -0500 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-02-28 00:43:23 -0500 |
commit | 32ee8c3e470d86588b51dc42ed01e85c5fa0f180 (patch) | |
tree | d544cc24c37c02f44f9cf89cb5647d74a61d7ce6 /arch/i386/kernel/cpu/cpufreq/powernow-k8.c | |
parent | 8ad5496d2359a19127ad9f2eda69485025c9917f (diff) |
[CPUFREQ] Lots of whitespace & CodingStyle cleanup.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/i386/kernel/cpu/cpufreq/powernow-k8.c')
-rw-r--r-- | arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c index 3b3a94987d10..e85e90524df7 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c | |||
@@ -83,11 +83,10 @@ static u32 find_millivolts_from_vid(struct powernow_k8_data *data, u32 vid) | |||
83 | */ | 83 | */ |
84 | static u32 convert_fid_to_vco_fid(u32 fid) | 84 | static u32 convert_fid_to_vco_fid(u32 fid) |
85 | { | 85 | { |
86 | if (fid < HI_FID_TABLE_BOTTOM) { | 86 | if (fid < HI_FID_TABLE_BOTTOM) |
87 | return 8 + (2 * fid); | 87 | return 8 + (2 * fid); |
88 | } else { | 88 | else |
89 | return fid; | 89 | return fid; |
90 | } | ||
91 | } | 90 | } |
92 | 91 | ||
93 | /* | 92 | /* |
@@ -177,7 +176,7 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid) | |||
177 | if (i++ > 100) { | 176 | if (i++ > 100) { |
178 | printk(KERN_ERR PFX "internal error - pending bit very stuck - no further pstate changes possible\n"); | 177 | printk(KERN_ERR PFX "internal error - pending bit very stuck - no further pstate changes possible\n"); |
179 | return 1; | 178 | return 1; |
180 | } | 179 | } |
181 | } while (query_current_values_with_pending_wait(data)); | 180 | } while (query_current_values_with_pending_wait(data)); |
182 | 181 | ||
183 | count_off_irt(data); | 182 | count_off_irt(data); |
@@ -782,9 +781,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) | |||
782 | /* verify only 1 entry from the lo frequency table */ | 781 | /* verify only 1 entry from the lo frequency table */ |
783 | if (fid < HI_FID_TABLE_BOTTOM) { | 782 | if (fid < HI_FID_TABLE_BOTTOM) { |
784 | if (cntlofreq) { | 783 | if (cntlofreq) { |
785 | /* if both entries are the same, ignore this | 784 | /* if both entries are the same, ignore this one ... */ |
786 | * one... | ||
787 | */ | ||
788 | if ((powernow_table[i].frequency != powernow_table[cntlofreq].frequency) || | 785 | if ((powernow_table[i].frequency != powernow_table[cntlofreq].frequency) || |
789 | (powernow_table[i].index != powernow_table[cntlofreq].index)) { | 786 | (powernow_table[i].index != powernow_table[cntlofreq].index)) { |
790 | printk(KERN_ERR PFX "Too many lo freq table entries\n"); | 787 | printk(KERN_ERR PFX "Too many lo freq table entries\n"); |
@@ -856,7 +853,7 @@ static int transition_frequency(struct powernow_k8_data *data, unsigned int inde | |||
856 | dprintk("cpu %d transition to index %u\n", smp_processor_id(), index); | 853 | dprintk("cpu %d transition to index %u\n", smp_processor_id(), index); |
857 | 854 | ||
858 | /* fid are the lower 8 bits of the index we stored into | 855 | /* fid are the lower 8 bits of the index we stored into |
859 | * the cpufreq frequency table in find_psb_table, vid are | 856 | * the cpufreq frequency table in find_psb_table, vid are |
860 | * the upper 8 bits. | 857 | * the upper 8 bits. |
861 | */ | 858 | */ |
862 | 859 | ||
@@ -1050,7 +1047,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
1050 | pol->governor = CPUFREQ_DEFAULT_GOVERNOR; | 1047 | pol->governor = CPUFREQ_DEFAULT_GOVERNOR; |
1051 | pol->cpus = cpu_core_map[pol->cpu]; | 1048 | pol->cpus = cpu_core_map[pol->cpu]; |
1052 | 1049 | ||
1053 | /* Take a crude guess here. | 1050 | /* Take a crude guess here. |
1054 | * That guess was in microseconds, so multiply with 1000 */ | 1051 | * That guess was in microseconds, so multiply with 1000 */ |
1055 | pol->cpuinfo.transition_latency = (((data->rvo + 8) * data->vstable * VST_UNITS_20US) | 1052 | pol->cpuinfo.transition_latency = (((data->rvo + 8) * data->vstable * VST_UNITS_20US) |
1056 | + (3 * (1 << data->irt) * 10)) * 1000; | 1053 | + (3 * (1 << data->irt) * 10)) * 1000; |