diff options
author | Dave Jones <davej@redhat.com> | 2006-08-01 14:06:43 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2006-10-02 17:14:38 -0400 |
commit | 11dc10195aed0636d9a60907594b349424b933a7 (patch) | |
tree | 81422a8b5e443eddc30ab67806d4442bdc032cff /drivers/char/watchdog/machzwd.c | |
parent | 795b89d207d8ff5397f9ff1f4d44662aa7c821fc (diff) |
[WATCHDOG] improve machzwd detection
On a machine with no machzwd, loading the module prints out..
machzwd: MachZ ZF-Logic Watchdog driver initializing.
0xffff
machzwd: Watchdog using action = RESET
- the 0xffff printk is unnecessary
- 0xffff seems to be 'hardware not present'
- fix CodingStyle. (This driver could use some more work here)
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'drivers/char/watchdog/machzwd.c')
-rw-r--r-- | drivers/char/watchdog/machzwd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c index ed2b6e1e3cec..276577d08fba 100644 --- a/drivers/char/watchdog/machzwd.c +++ b/drivers/char/watchdog/machzwd.c | |||
@@ -426,8 +426,7 @@ static int __init zf_init(void) | |||
426 | printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n"); | 426 | printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n"); |
427 | 427 | ||
428 | ret = zf_get_ZFL_version(); | 428 | ret = zf_get_ZFL_version(); |
429 | printk("%#x\n", ret); | 429 | if ((!ret) || (ret == 0xffff)) { |
430 | if((!ret) || (ret != 0xffff)){ | ||
431 | printk(KERN_WARNING PFX ": no ZF-Logic found\n"); | 430 | printk(KERN_WARNING PFX ": no ZF-Logic found\n"); |
432 | return -ENODEV; | 431 | return -ENODEV; |
433 | } | 432 | } |