[S390] improve suspend/resume error messages

From: Michael Holzheu <holzheu@linux.vnet.ibm.com>

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 016f9e9d259186e14351168b682b168fb25ab58b..d34617682a6295172a2c0d5d5fa47e258e4d2b23 100644 (file)
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -964,7 +964,8 @@ static int dcssblk_freeze(struct device *dev)
                        break;
        }
        if (rc)
-               pr_err("Suspend failed because device %s is writeable.\n",
+               pr_err("Suspending the system failed because DCSS device %s "
+                      "is writable\n",
                       dev_info->segment_name);
        return rc;
 }
@@ -987,8 +988,8 @@ static int dcssblk_restore(struct device *dev)
                                goto out_panic;
                        }
                        if (start != entry->start || end != entry->end) {
-                               pr_err("Mismatch of start / end address after "
-                                      "resuming device %s\n",
+                               pr_err("The address range of DCSS %s changed "
+                                      "while the system was suspended\n",
                                       entry->segment_name);
                                goto out_panic;
                        }

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 2e9e1ecd6d82b2d1f03181d4237d04ff37dedab6..db442cd6621ec9d838325c15c2f47cbb102992a1 100644 (file)
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -443,7 +443,7 @@ fail:
  */
 static void xpram_resume_error(const char *message)
 {
-       pr_err("Resume error: %s\n", message);
+       pr_err("Resuming the system failed: %s\n", message);
        panic("xpram resume error\n");
 }
 

diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index cb7854c10c0479585d1879f9c0a3fe8a90a713a1..f2bc287b69e4e4c1c5c35f01ddb500d2ca63aed9 100644 (file)
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -250,14 +250,14 @@ static int vmwdt_resume(void)
 static int vmwdt_suspend(void)
 {
        if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) {
-               pr_err("The watchdog is in use. "
-                       "This prevents hibernation or suspend.\n");
+               pr_err("The system cannot be suspended while the watchdog"
+                       " is in use\n");
                return NOTIFY_BAD;
        }
        if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) {
                clear_bit(VMWDT_OPEN, &vmwdt_is_open);
-               pr_err("The watchdog is running. "
-                       "This prevents hibernation or suspend.\n");
+               pr_err("The system cannot be suspended while the watchdog"
+                       " is running\n");
                return NOTIFY_BAD;
        }
        return NOTIFY_DONE;