[PATCH] watchdog: Strip stray space in log message

[PATCH] watchdog: Strip stray space in log message

[Jean Delvare]

Strip a stray space in log messages of 3 watchdog drivers.
(And fold these long lines to make checkpatch.pl happy.)

Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
This patch was already sent on:
 * 2008-01-19

 drivers/watchdog/mpcore_wdt.c |    3 ++-
 drivers/watchdog/softdog.c    |    3 ++-
 drivers/watchdog/txx9wdt.c    |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

--- linux-2.6.26-rc4.orig/drivers/watchdog/mpcore_wdt.c	2008-06-03 10:55:01.000000000 +0200
+++ linux-2.6.26-rc4/drivers/watchdog/mpcore_wdt.c	2008-06-03 10:57:25.000000000 +0200
@@ -405,7 +405,8 @@ static struct platform_driver mpcore_wdt
 	},
 };
 
-static char banner[] __initdata = KERN_INFO "MPcore Watchdog Timer: 0.1. mpcore_noboot=%d mpcore_margin=%d sec (nowayout= %d)\n";
+static char banner[] __initdata = KERN_INFO "MPcore Watchdog Timer: 0.1. "
+	"mpcore_noboot=%d mpcore_margin=%d sec (nowayout=%d)\n";
 
 static int __init mpcore_wdt_init(void)
 {
--- linux-2.6.26-rc4.orig/drivers/watchdog/softdog.c	2008-06-03 10:55:01.000000000 +0200
+++ linux-2.6.26-rc4/drivers/watchdog/softdog.c	2008-06-03 10:57:25.000000000 +0200
@@ -262,7 +262,8 @@ static struct notifier_block softdog_not
 	.notifier_call	= softdog_notify_sys,
 };
 
-static char banner[] __initdata = KERN_INFO "Software Watchdog Timer: 0.07 initialized. soft_noboot=%d soft_margin=%d sec (nowayout= %d)\n";
+static char banner[] __initdata = KERN_INFO "Software Watchdog Timer: 0.07 "
+	"initialized. soft_noboot=%d soft_margin=%d sec (nowayout=%d)\n";
 
 static int __init watchdog_init(void)
 {
--- linux-2.6.26-rc4.orig/drivers/watchdog/txx9wdt.c	2008-04-17 04:49:44.000000000 +0200
+++ linux-2.6.26-rc4/drivers/watchdog/txx9wdt.c	2008-06-04 15:25:34.000000000 +0200
@@ -227,7 +227,7 @@ static int __init txx9wdt_probe(struct p
 	}
 
 	printk(KERN_INFO "Hardware Watchdog Timer for TXx9: "
-	       "timeout=%d sec (max %ld) (nowayout= %d)\n",
+	       "timeout=%d sec (max %ld) (nowayout=%d)\n",
 	       timeout, WD_MAX_TIMEOUT, nowayout);
 
 	return 0;

-- 
Jean Delvare
Suse L3

Re: [PATCH] watchdog: Strip stray space in log message

[Alan Cox]

On Wed, 4 Jun 2008 15:38:53 +0200
Jean Delvare <jdelvare@suse.de> wrote:

> Strip a stray space in log messages of 3 watchdog drivers.
> (And fold these long lines to make checkpatch.pl happy.)

Don't break up strings of quoted text - it makes grepping for them much
harder.

Alan

Re: [PATCH] watchdog: Strip stray space in log message

[Jean Delvare]

Hi Alan,

Le mercredi 04 juin 2008, Alan Cox a écrit :
> On Wed, 4 Jun 2008 15:38:53 +0200
> Jean Delvare <jdelvare@suse.de> wrote:
> 
> > Strip a stray space in log messages of 3 watchdog drivers.
> > (And fold these long lines to make checkpatch.pl happy.)
> 
> Don't break up strings of quoted text - it makes grepping for them much
> harder.

As written above, checkpatch.pl told me to break them up.

CodingStyle says: "Long strings are as well broken into shorter
strings." And quite rightly so IMHO, if you have to rely on grepping
the whole kernel tree to find out where a log message comes from, it
means that this log message is bad and needs to be improved.

Thanks,
-- 
Jean Delvare
Suse L3