diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2009-04-14 16:20:07 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2009-06-18 03:30:30 -0400 |
commit | a77dba7e444a6618cbb666d1b42b79842b9c0171 (patch) | |
tree | f8e16e2515e83eba774fd06bfca1080c7fa46adc /drivers/watchdog/machzwd.c | |
parent | 0a7e658226d66a259097db5f4734589604b303fd (diff) |
[WATCHDOG] Some more general cleanup
Clean-up the watchdog drivers so that checkpatch.pl get's happy...
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/machzwd.c')
-rw-r--r-- | drivers/watchdog/machzwd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index 2dfc27559bf7..b6b3f59ab446 100644 --- a/drivers/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c | |||
@@ -118,7 +118,8 @@ static struct watchdog_info zf_info = { | |||
118 | */ | 118 | */ |
119 | static int action; | 119 | static int action; |
120 | module_param(action, int, 0); | 120 | module_param(action, int, 0); |
121 | MODULE_PARM_DESC(action, "after watchdog resets, generate: 0 = RESET(*) 1 = SMI 2 = NMI 3 = SCI"); | 121 | MODULE_PARM_DESC(action, "after watchdog resets, generate: " |
122 | "0 = RESET(*) 1 = SMI 2 = NMI 3 = SCI"); | ||
122 | 123 | ||
123 | static void zf_ping(unsigned long data); | 124 | static void zf_ping(unsigned long data); |
124 | 125 | ||
@@ -142,7 +143,8 @@ static unsigned long next_heartbeat; | |||
142 | #ifndef ZF_DEBUG | 143 | #ifndef ZF_DEBUG |
143 | # define dprintk(format, args...) | 144 | # define dprintk(format, args...) |
144 | #else | 145 | #else |
145 | # define dprintk(format, args...) printk(KERN_DEBUG PFX ":%s:%d: " format, __func__, __LINE__ , ## args) | 146 | # define dprintk(format, args...) printk(KERN_DEBUG PFX |
147 | ":%s:%d: " format, __func__, __LINE__ , ## args) | ||
146 | #endif | 148 | #endif |
147 | 149 | ||
148 | 150 | ||
@@ -340,7 +342,8 @@ static int zf_close(struct inode *inode, struct file *file) | |||
340 | zf_timer_off(); | 342 | zf_timer_off(); |
341 | else { | 343 | else { |
342 | del_timer(&zf_timer); | 344 | del_timer(&zf_timer); |
343 | printk(KERN_ERR PFX ": device file closed unexpectedly. Will not stop the WDT!\n"); | 345 | printk(KERN_ERR PFX ": device file closed unexpectedly. " |
346 | "Will not stop the WDT!\n"); | ||
344 | } | 347 | } |
345 | clear_bit(0, &zf_is_open); | 348 | clear_bit(0, &zf_is_open); |
346 | zf_expect_close = 0; | 349 | zf_expect_close = 0; |