x86: Coding style fixes to arch/x86/kernel/cpu/cpufreq/powernow-k6.c
PATCH 1/1 x86: Coding style fixes to arch/x86/kernel/cpu/cpufreq/powernow-k6.c
Ciao Ingo, all,
Before:
total: 11 errors, 15 warnings, 255 lines checked
After:
total: 0 errors, 6 warnings, 254 lines checked
paolo@paolo-desktop:~/linux.trees.git$ md5sum /tmp/powernow-k6.o.* 476932f5e1ffe365db9d1dfb3f860369 /tmp/powernow-k6.o.after 476932f5e1ffe365db9d1dfb3f860369 /tmp/powernow-k6.o.before
--- arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 41 ++++++++++++++--------------- 1 files changed, 20 insertions(+), 21 deletions(-)
arch/x86/kernel/cpu/cpufreq/powernow-k6.c +20 -21
@@ -15,12 +15,11 @@#include <linux/slab.h> #include <asm/msr.h> -#include <asm/timex.h> -#include <asm/io.h> +#include <linux/timex.h> +#include <linux/io.h> - -#define POWERNOW_IOPORT 0xfff0/* it doesn't matter where, as long -as it is unused */ +#define POWERNOW_IOPORT 0xfff0/* it doesn't matter where, as long +as it is unused */ static unsigned int busfreq;/* FSB, in 10 kHz */ static unsigned int max_multiplier;
@@ -53,7 +52,7 @@ static int powernow_k6_get_cpu_multiplier(void) msrval =POWERNOW_IOPORT +0x1 ;wrmsr (MSR_K6_EPMR , msrval,0 );/* enable the PowerNow port */ - invalue=inl (POWERNOW_IOPORT +0x8 ); + invalue =inl (POWERNOW_IOPORT +0x8 ); msrval =POWERNOW_IOPORT +0x0 ;wrmsr (MSR_K6_EPMR , msrval,0 );/* disable it again */
@@ -67,9 +66,9 @@ static int powernow_k6_get_cpu_multiplier(void)* * Tries to change the PowerNow! multiplier */ -static void powernow_k6_set_state (unsigned int best_i) +static void powernow_k6_set_state (unsigned int best_i) { -unsigned long outvalue=0 , invalue=0 ; +unsigned long outvalue =0 , invalue =0 ;unsigned long msrval;struct cpufreq_freqs freqs;
@@ -90,10 +89,10 @@ static void powernow_k6_set_state (unsigned int best_i) msrval =POWERNOW_IOPORT +0x1 ;wrmsr (MSR_K6_EPMR , msrval,0 );/* enable the PowerNow port */ - invalue=inl (POWERNOW_IOPORT +0x8 ); + invalue =inl (POWERNOW_IOPORT +0x8 ); invalue = invalue &0xf ; outvalue = outvalue | invalue; -outl (outvalue ,(POWERNOW_IOPORT +0x8 )); +outl (outvalue , (POWERNOW_IOPORT +0x8 )); msrval =POWERNOW_IOPORT +0x0 ;wrmsr (MSR_K6_EPMR , msrval,0 );/* disable it again */
@@ -124,7 +123,7 @@ static int powernow_k6_verify(struct cpufreq_policy *policy)* * sets a new CPUFreq policy */ -static int powernow_k6_target (struct cpufreq_policy *policy, +static int powernow_k6_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation) {
@@ -152,7 +151,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
@@ -165,7 +164,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy) result =cpufreq_frequency_table_cpuinfo (policy, clock_ratio);if (result) -return (result); +return result;cpufreq_frequency_table_get_attr (clock_ratio, policy->cpu);
@@ -176,8 +175,8 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)static int powernow_k6_cpu_exit (struct cpufreq_policy *policy) {unsigned int i; -for (i=0 ; i<8 ; i++) { -if (i==max_multiplier) +for (i =0 ; i <8 ; i++) { +if (i == max_multiplier)powernow_k6_set_state (i); }cpufreq_frequency_table_put_attr (policy->cpu);
@@ -189,7 +188,7 @@ static unsigned int powernow_k6_get(unsigned int cpu)return busfreq *powernow_k6_get_cpu_multiplier (); } -static struct freq_attr * powernow_k6_attr[] = { +static struct freq_attr *powernow_k6_attr[] = { &cpufreq_freq_attr_scaling_available_freqs,NULL , };
@@ -227,7 +226,7 @@ static int __init powernow_k6_init(void) }if (cpufreq_register_driver (&powernow_k6_driver)) { -release_region (POWERNOW_IOPORT ,16 ); +release_region (POWERNOW_IOPORT ,16 );return -EINVAL ; }
@@ -243,13 +242,13 @@ static int __init powernow_k6_init(void) static void __exit powernow_k6_exit(void) {cpufreq_unregister_driver (&powernow_k6_driver); -release_region (POWERNOW_IOPORT ,16 ); +release_region (POWERNOW_IOPORT ,16 ); } -MODULE_AUTHOR ("Arjan van de Ven <[email protected]>, Dave Jones <[email protected]>, Dominik Brodowski <[email protected]>" ); -MODULE_DESCRIPTION ("PowerNow! driver for AMD K6-2+ / K6-3+ processors." ); -MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Arjan van de Ven <[email protected]>, Dave Jones <[email protected]>, Dominik Brodowski <[email protected]>" ); +MODULE_DESCRIPTION ("PowerNow! driver for AMD K6-2+ / K6-3+ processors." ); +MODULE_LICENSE ("GPL" );module_init (powernow_k6_init);module_exit (powernow_k6_exit);
Signature · 1 line
1.5.6.rc1.21.g03300
Quoted 5 lines · Paolo Ciarrocchi
Ciao Ingo, all,
Before:
total: 11 errors, 15 warnings, 255 lines checked
Quoted 8 lines
After:
total: 0 errors, 6 warnings, 254 lines checkedpaolo@paolo-desktop:~/linux.trees.git$ md5sum /tmp/powernow-k6.o.* 476932f5e1ffe365db9d1dfb3f860369 /tmp/powernow-k6.o.after 476932f5e1ffe365db9d1dfb3f860369 /tmp/powernow-k6.o.beforeSigned-off-by Paolo Ciarrocchi <[email protected]>
I'll queue this up in cpufreq.git
arch/x86/kernel/cpu/cpufreq/powernow-k6.c static int __init powernow_k6_init(void) · line 251
Quoted 6 lines
arch/x86/kernel/cpu/cpufreq/powernow-k6.c +3
-3-MODULE_AUTHOR ("Arjan van de Ven <[email protected]>, Dave Jones <[email protected]>, Dominik Brodowski <[email protected]>" ); -MODULE_DESCRIPTION ("PowerNow! driver for AMD K6-2+ / K6-3+ processors." ); -MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Arjan van de Ven <[email protected]>, Dave Jones <[email protected]>, Dominik Brodowski <[email protected]>" ); +MODULE_DESCRIPTION ("PowerNow! driver for AMD K6-2+ / K6-3+ processors." ); +MODULE_LICENSE ("GPL" );
Incidentally, arjanv@redhat hasn't been correct in a while. Arjan, which preferred address do you want this changed to? xircom_cb.c is also in need of a similar change.
(There are other instances of your old address, but those are the
only user-visible ones)
Dave
Signature · 1 line
http://www.codemonkey.org.uk
Quoted 3 lines · Dave Jones
Quoted 1 line
Signed-off-by Paolo Ciarrocchi <[email protected]>I'll queue this up in cpufreq.git
thank you Dave and apologize for not sending you directly the patch.
you might want to look at the other patch i sent a few hours ago, subject was:
Subject: [PATCH] x86: Coding style fixes to arch/x86/kernel/cpu/cpufreq/elanfreq.c
ciao,
Signature · 2 lines
Paolo http://paolo.ciarrocchi.googlepages.com/