[PATCH 2.6.4] (2/5) p4-clockmod: single-line KERN_WARNING messages

[PATCH 2.6.4] (2/5) p4-clockmod: single-line KERN_WARNING messages

[Dominik Brodowski]

Use KERN_WARNING for warning. Thanks to Dave Jones, Pavel Machel and Russell 
King for their help getting this patch right.

 arch/i386/kernel/cpu/cpufreq/p4-clockmod.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2004-03-15 09:20:50.000000000 +0100
+++ linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2004-03-15 13:28:00.997133712 +0100
@@ -181,21 +181,24 @@
 {
 	if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
 		/* Pentium M */
-		printk(KERN_DEBUG PFX "Warning: Pentium M detected. The speedstep_centrino module\n");
-		printk(KERN_DEBUG PFX "offers voltage scaling in addition of frequency scaling. You\n");
-		printk(KERN_DEBUG PFX "should use that instead of p4-clockmod, if possible.\n");
+		printk(KERN_WARNING PFX "Warning: Pentium M detected. "
+		       "The speedstep_centrino module offers voltage scaling"
+		       " in addition of frequency scaling. You should use "
+		       "that instead of p4-clockmod, if possible.\n");
 		return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
 	}
 
 	if (c->x86 != 0xF) {
-		printk(KERN_DEBUG PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
+		printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
 		return 0;
 	}
 
 	if (speedstep_detect_processor() == SPEEDSTEP_PROCESSOR_P4M) {
-		printk(KERN_DEBUG PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq \n");
-		printk(KERN_DEBUG PFX "modules offers voltage scaling in addition of frequency scaling. You\n");
-		printk(KERN_DEBUG PFX "should use either one instead of p4-clockmod, if possible.\n");
+		printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
+		       "The speedstep-ich or acpi cpufreq modules offers "
+		       "voltage scaling in addition of frequency scaling. "
+		       "You should use either one instead of p4-clockmod, "
+		       "if possible.\n");
 		return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_P4M);
 	}

Re: [PATCH 2.6.4] (2/5) p4-clockmod: single-line KERN_WARNING messages

[Viktor Radnai]

Hi all,

It seems that there's a slight gramatical error in this patch. The 
second message says:

 > +           printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
 > +		    "The speedstep-ich or acpi cpufreq modules offers "
 > +		    "voltage scaling in addition of frequency scaling. "
 > +		    "You should use either one instead of p4-clockmod, "
 > +		    "if possible.\n");

It should say "offer" instead of "offers":

+		    "The speedstep-ich or acpi cpufreq modules offer "

Apologies if this is considered nitpicking...

Regards,
Vik

Dominik Brodowski wrote:
> Use KERN_WARNING for warning. Thanks to Dave Jones, Pavel Machel and Russell 
> King for their help getting this patch right.
> 
>  arch/i386/kernel/cpu/cpufreq/p4-clockmod.c |   17 ++++++++++-------
>  1 files changed, 10 insertions(+), 7 deletions(-)
> 
> diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
> --- linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2004-03-15 09:20:50.000000000 +0100
> +++ linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2004-03-15 13:28:00.997133712 +0100
> @@ -181,21 +181,24 @@
>  {
>  	if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
>  		/* Pentium M */
> -		printk(KERN_DEBUG PFX "Warning: Pentium M detected. The speedstep_centrino module\n");
> -		printk(KERN_DEBUG PFX "offers voltage scaling in addition of frequency scaling. You\n");
> -		printk(KERN_DEBUG PFX "should use that instead of p4-clockmod, if possible.\n");
> +		printk(KERN_WARNING PFX "Warning: Pentium M detected. "
> +		       "The speedstep_centrino module offers voltage scaling"
> +		       " in addition of frequency scaling. You should use "
> +		       "that instead of p4-clockmod, if possible.\n");
>  		return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
>  	}
>  
>  	if (c->x86 != 0xF) {
> -		printk(KERN_DEBUG PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
> +		printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
>  		return 0;
>  	}
>  
>  	if (speedstep_detect_processor() == SPEEDSTEP_PROCESSOR_P4M) {
> -		printk(KERN_DEBUG PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq \n");
> -		printk(KERN_DEBUG PFX "modules offers voltage scaling in addition of frequency scaling. You\n");
> -		printk(KERN_DEBUG PFX "should use either one instead of p4-clockmod, if possible.\n");
> +		printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
> +		       "The speedstep-ich or acpi cpufreq modules offers "
> +		       "voltage scaling in addition of frequency scaling. "
> +		       "You should use either one instead of p4-clockmod, "
> +		       "if possible.\n");
>  		return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_P4M);
>  	}
>  
> 
> _______________________________________________
> Cpufreq mailing list
> Cpufreq@www.linux.org.uk
> http://www.linux.org.uk/mailman/listinfo/cpufreq
>