diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-07-14 09:59:40 +0200 |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-07-14 10:02:23 +0200 |
| commit | 0d130066801af8f0a0ea8c70c9c7374c51fd1a92 (patch) | |
| tree | bf01b1eebf194e8815f25a30e069ba5dfcefd1c4 /drivers/s390/char | |
| parent | ded77fb4dfcd6f84e564ddd9458208bf5b691c7f (diff) | |
| download | linux-0d130066801af8f0a0ea8c70c9c7374c51fd1a92.tar.gz linux-0d130066801af8f0a0ea8c70c9c7374c51fd1a92.tar.bz2 linux-0d130066801af8f0a0ea8c70c9c7374c51fd1a92.zip | |
[S390] Cleanup vmwatch printk messages.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/vmwatchdog.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c index 19f8389291b6..56b3eab019cb 100644 --- a/drivers/s390/char/vmwatchdog.c +++ b/drivers/s390/char/vmwatchdog.c @@ -92,23 +92,15 @@ static int vmwdt_keepalive(void) func = vmwdt_conceal ? (wdt_init | wdt_conceal) : wdt_init; ret = __diag288(func, vmwdt_interval, ebc_cmd, len); + WARN_ON(ret != 0); kfree(ebc_cmd); - - if (ret) { - printk(KERN_WARNING "%s: problem setting interval %d, " - "cmd %s\n", __func__, vmwdt_interval, - vmwdt_cmd); - } return ret; } static int vmwdt_disable(void) { int ret = __diag288(wdt_cancel, 0, "", 0); - if (ret) { - printk(KERN_WARNING "%s: problem disabling watchdog\n", - __func__); - } + WARN_ON(ret != 0); return ret; } @@ -121,10 +113,8 @@ static int __init vmwdt_probe(void) static char __initdata ebc_begin[] = { 194, 197, 199, 201, 213 }; - if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0) { - printk(KERN_INFO "z/VM watchdog not available\n"); + if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0) return -EINVAL; - } return vmwdt_disable(); } |