aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/char/vmwatchdog.c16
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)
92 92
93 func = vmwdt_conceal ? (wdt_init | wdt_conceal) : wdt_init; 93 func = vmwdt_conceal ? (wdt_init | wdt_conceal) : wdt_init;
94 ret = __diag288(func, vmwdt_interval, ebc_cmd, len); 94 ret = __diag288(func, vmwdt_interval, ebc_cmd, len);
95 WARN_ON(ret != 0);
95 kfree(ebc_cmd); 96 kfree(ebc_cmd);
96
97 if (ret) {
98 printk(KERN_WARNING "%s: problem setting interval %d, "
99 "cmd %s\n", __func__, vmwdt_interval,
100 vmwdt_cmd);
101 }
102 return ret; 97 return ret;
103} 98}
104 99
105static int vmwdt_disable(void) 100static int vmwdt_disable(void)
106{ 101{
107 int ret = __diag288(wdt_cancel, 0, "", 0); 102 int ret = __diag288(wdt_cancel, 0, "", 0);
108 if (ret) { 103 WARN_ON(ret != 0);
109 printk(KERN_WARNING "%s: problem disabling watchdog\n",
110 __func__);
111 }
112 return ret; 104 return ret;
113} 105}
114 106
@@ -121,10 +113,8 @@ static int __init vmwdt_probe(void)
121 static char __initdata ebc_begin[] = { 113 static char __initdata ebc_begin[] = {
122 194, 197, 199, 201, 213 114 194, 197, 199, 201, 213
123 }; 115 };
124 if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0) { 116 if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0)
125 printk(KERN_INFO "z/VM watchdog not available\n");
126 return -EINVAL; 117 return -EINVAL;
127 }
128 return vmwdt_disable(); 118 return vmwdt_disable();
129} 119}
130 120