diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:52:23 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:52:23 -0800 |
commit | be9bf30c73184e0f1e4e0a50fb193d2a551bf75e (patch) | |
tree | b94e1b39d59fa10b26fd740993ded00708de08e1 /arch/i386/kernel/cpu/cpufreq/powernow-k6.c | |
parent | ace48471736a4b00753c74633f430c4a3a7d89cb (diff) | |
parent | 84f0b1ef8c013b33dea9bbc2521094dd29110cf0 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] kzalloc conversion for gx-suspmod
[CPUFREQ] Whitespace cleanup
[CPUFREQ] Mark longhaul driver as broken.
[PATCH] cpufreq: fix section mismatch warnings
[CPUFREQ] Fix the p4-clockmod N60 errata workaround.
[CPUFREQ] Fix handling for CPU hotplug
[CPUFREQ] powernow-k8: Let cpufreq driver handle affected CPUs
[CPUFREQ] Lots of whitespace & CodingStyle cleanup.
[CPUFREQ] Remove duplicate cpuinfo struct
[CPUFREQ] Silence powernow-k8 warning on k7's.
Diffstat (limited to 'arch/i386/kernel/cpu/cpufreq/powernow-k6.c')
-rw-r--r-- | arch/i386/kernel/cpu/cpufreq/powernow-k6.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k6.c b/arch/i386/kernel/cpu/cpufreq/powernow-k6.c index 222f8cfe3c5..f89524051e4 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k6.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k6.c @@ -8,7 +8,7 @@ */ #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> #include <linux/ioport.h> @@ -50,7 +50,7 @@ static int powernow_k6_get_cpu_multiplier(void) { u64 invalue = 0; u32 msrval; - + msrval = POWERNOW_IOPORT + 0x1; wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */ invalue=inl(POWERNOW_IOPORT + 0x8); @@ -81,7 +81,7 @@ static void powernow_k6_set_state (unsigned int best_i) freqs.old = busfreq * powernow_k6_get_cpu_multiplier(); freqs.new = busfreq * clock_ratio[best_i].index; freqs.cpu = 0; /* powernow-k6.c is UP only driver */ - + cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); /* we now need to transform best_i to the BVC format, see AMD#23446 */ @@ -152,7 +152,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy) busfreq = cpu_khz / max_multiplier; /* table init */ - for (i=0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) { + for (i=0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) { if (clock_ratio[i].index > max_multiplier) clock_ratio[i].frequency = CPUFREQ_ENTRY_INVALID; else @@ -182,7 +182,7 @@ static int powernow_k6_cpu_exit(struct cpufreq_policy *policy) powernow_k6_set_state(i); } cpufreq_frequency_table_put_attr(policy->cpu); - return 0; + return 0; } static unsigned int powernow_k6_get(unsigned int cpu) @@ -196,8 +196,8 @@ static struct freq_attr* powernow_k6_attr[] = { }; static struct cpufreq_driver powernow_k6_driver = { - .verify = powernow_k6_verify, - .target = powernow_k6_target, + .verify = powernow_k6_verify, + .target = powernow_k6_target, .init = powernow_k6_cpu_init, .exit = powernow_k6_cpu_exit, .get = powernow_k6_get, @@ -215,7 +215,7 @@ static struct cpufreq_driver powernow_k6_driver = { * on success. */ static int __init powernow_k6_init(void) -{ +{ struct cpuinfo_x86 *c = cpu_data; if ((c->x86_vendor != X86_VENDOR_AMD) || (c->x86 != 5) || |