3 files changed, 9 insertions, 8 deletions

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 016f9e9d2591..d34617682a62 100644
--- 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 2e9e1ecd6d82..db442cd6621e 100644
--- 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 cb7854c10c04..f2bc287b69e4 100644
--- 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;