leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[S390] Cleanup vmwatch printk messages.

Browse Source 
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
This commit is contained in:
Martin Schwidefsky 2008-07-14 09:59:40 +02:00 committed by Heiko Carstens
parent ded77fb4df
commit 0d13006680
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/s390/char/vmwatchdog.c
View File

@ -92,23 +92,15 @@ static int vmwdt_keepalive(void)
func = vmwdt_conceal ? (wdt_init | wdt_conceal) : wdt_init; func = vmwdt_conceal ? (wdt_init | wdt_conceal) : wdt_init;
ret = __diag288(func, vmwdt_interval, ebc_cmd, len); ret = __diag288(func, vmwdt_interval, ebc_cmd, len);
WARN_ON(ret != 0);
kfree(ebc_cmd); kfree(ebc_cmd);
if (ret) {
printk(KERN_WARNING "%s: problem setting interval %d, "
"cmd %s\n", __func__, vmwdt_interval,
vmwdt_cmd);
}
return ret; return ret;
} }
static int vmwdt_disable(void) static int vmwdt_disable(void)
{ {
int ret = __diag288(wdt_cancel, 0, "", 0); int ret = __diag288(wdt_cancel, 0, "", 0);
if (ret) { WARN_ON(ret != 0);
printk(KERN_WARNING "%s: problem disabling watchdog\n",
__func__);
}
return ret; return ret;
} }
@ -121,10 +113,8 @@ static int __init vmwdt_probe(void)
static char __initdata ebc_begin[] = { static char __initdata ebc_begin[] = {
194, 197, 199, 201, 213 194, 197, 199, 201, 213
}; };
if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0) { if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0)
printk(KERN_INFO "z/VM watchdog not available\n");
return -EINVAL; return -EINVAL;
}
return vmwdt_disable(); return vmwdt_disable();
} }