Commit 11dc1019 authored Aug 01, 2006 by Dave Jones Committed by Wim Van Sebroeck Oct 02, 2006

[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>

parent 795b89d2

drivers/char/watchdog/machzwd.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -426,8 +426,7 @@ static int __init zf_init(void)
	printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n");		printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n");

	ret = zf_get_ZFL_version();		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");		printk(KERN_WARNING PFX ": no ZF-Logic found\n");
	return -ENODEV;		return -ENODEV;
	}		}