2006-08-01 20:06:45

by Dave Jones

[permalink] [raw]
Subject: 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 <[email protected]>

--- linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c~ 2006-02-01 22:20:16.000000000 -0500
+++ linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c 2006-02-01 22:22:23.000000000 -0500
@@ -427,8 +427,7 @@ static int __init zf_init(void)
printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n");

ret = zf_get_ZFL_version();
- printk("%#x\n", ret);
- if((!ret) || (ret != 0xffff)){
+ if ((!ret) || (ret == 0xffff)) {
printk(KERN_WARNING PFX ": no ZF-Logic found\n");
return -ENODEV;
}


--
http://www.codemonkey.org.uk