Re: [PATCH 2.6.30] nvidiafb: fix missing space in log message

[Andrew Morton]

On Tue, 16 Jun 2009 17:51:14 +0200 Mikael Pettersson <mikpe@xxxxxxxx> wrote:

> On bootup nvidiafb prints the following on my Apple G5:
> 
> 	nvidiafb: CRTC 1appears to have a CRT attached
> 
> There should be a space between the '1' and the 'appears'.
> 
> Fix: add the space
> 
> Signed-off-by: Mikael Pettersson <mikpe@xxxxxxxx>
> 
> diff -rupN linux-2.6.30/drivers/video/nvidia/nv_setup.c linux-2.6.30.nvidiafb-logmsg-missing-space/drivers/video/nvidia/nv_setup.c
> --- linux-2.6.30/drivers/video/nvidia/nv_setup.c	2009-06-10 12:00:46.000000000 +0200
> +++ linux-2.6.30.nvidiafb-logmsg-missing-space/drivers/video/nvidia/nv_setup.c	2009-06-16 17:41:21.000000000 +0200
> @@ -543,7 +543,7 @@ int NVCommonSetup(struct fb_info *info)
>  		} else if (analog_on_B) {
>  			CRTCnumber = outputBfromCRTC;
>  			FlatPanel = 0;
> -			printk("nvidiafb: CRTC %i"
> +			printk("nvidiafb: CRTC %i "
>  			       "appears to have a "
>  			       "CRT attached\n", CRTCnumber);
>  		} else if (slaved_on_A) {

Yeah, someone seems to have gone checkpatch-crazy there.

Let's be slightly less nutty and do

--- a/drivers/video/nvidia/nv_setup.c~nvidiafb-fix-missing-space-in-log-message
+++ a/drivers/video/nvidia/nv_setup.c
@@ -543,8 +543,7 @@ int NVCommonSetup(struct fb_info *info)
 		} else if (analog_on_B) {
 			CRTCnumber = outputBfromCRTC;
 			FlatPanel = 0;
-			printk("nvidiafb: CRTC %i"
-			       "appears to have a "
+			printk("nvidiafb: CRTC %i appears to have a "
 			       "CRT attached\n", CRTCnumber);
 		} else if (slaved_on_A) {
 			CRTCnumber = 0;
_

Which happens to exactly copy the printk from five lines earlier...


		} else if (analog_on_A) {
			CRTCnumber = outputAfromCRTC;
			FlatPanel = 0;
			printk("nvidiafb: CRTC %i appears to have a "
			       "CRT attached\n", CRTCnumber);
		} else if (analog_on_B) {
			CRTCnumber = outputBfromCRTC;
			FlatPanel = 0;
			printk("nvidiafb: CRTC %i appears to have a "
			       "CRT attached\n", CRTCnumber);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/