diff options
Diffstat (limited to 'drivers/watchdog/machzwd.c')
-rw-r--r-- | drivers/watchdog/machzwd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index 2d118cf022fc..1332b838cc58 100644 --- a/drivers/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c | |||
@@ -54,7 +54,7 @@ | |||
54 | 54 | ||
55 | /* indexes */ /* size */ | 55 | /* indexes */ /* size */ |
56 | #define ZFL_VERSION 0x02 /* 16 */ | 56 | #define ZFL_VERSION 0x02 /* 16 */ |
57 | #define CONTROL 0x10 /* 16 */ | 57 | #define CONTROL 0x10 /* 16 */ |
58 | #define STATUS 0x12 /* 8 */ | 58 | #define STATUS 0x12 /* 8 */ |
59 | #define COUNTER_1 0x0C /* 16 */ | 59 | #define COUNTER_1 0x0C /* 16 */ |
60 | #define COUNTER_2 0x0E /* 8 */ | 60 | #define COUNTER_2 0x0E /* 8 */ |
@@ -143,7 +143,7 @@ static unsigned long next_heartbeat; | |||
143 | #ifndef ZF_DEBUG | 143 | #ifndef ZF_DEBUG |
144 | # define dprintk(format, args...) | 144 | # define dprintk(format, args...) |
145 | #else | 145 | #else |
146 | # define dprintk(format, args...) printk(KERN_DEBUG PFX | 146 | # define dprintk(format, args...) printk(KERN_DEBUG PFX \ |
147 | ":%s:%d: " format, __func__, __LINE__ , ## args) | 147 | ":%s:%d: " format, __func__, __LINE__ , ## args) |
148 | #endif | 148 | #endif |
149 | 149 | ||
@@ -388,7 +388,7 @@ static struct notifier_block zf_notifier = { | |||
388 | 388 | ||
389 | static void __init zf_show_action(int act) | 389 | static void __init zf_show_action(int act) |
390 | { | 390 | { |
391 | char *str[] = { "RESET", "SMI", "NMI", "SCI" }; | 391 | static const char * const str[] = { "RESET", "SMI", "NMI", "SCI" }; |
392 | 392 | ||
393 | printk(KERN_INFO PFX ": Watchdog using action = %s\n", str[act]); | 393 | printk(KERN_INFO PFX ": Watchdog using action = %s\n", str[act]); |
394 | } | 394 | } |