4 files changed, 14 insertions, 16 deletions

diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 5a519fac37b..2fe45ff77b7 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -8,7 +8,7 @@
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
  */
 
-#define KMSG_COMPONENT "tape"
+#define KMSG_COMPONENT "tape_34xx"
 
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 418f72dd39b..e4cc3aae916 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -8,7 +8,7 @@
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
  */
 
-#define KMSG_COMPONENT "tape"
+#define KMSG_COMPONENT "tape_3590"
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -39,8 +39,6 @@ EXPORT_SYMBOL(TAPE_DBF_AREA);
  * - Read Alternate:             implemented
  *******************************************************************/
 
-#define KMSG_COMPONENT "tape"
-
 static const char *tape_3590_msg[TAPE_3590_MAX_MSG] = {
         [0x00] = "",
         [0x10] = "Lost Sense",
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 1c2a582e626..4cb9e70507a 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -310,8 +310,8 @@ tapeblock_revalidate_disk(struct gendisk *disk)
         if (rc < 0)
                 return rc;
 
-        dev_info(&device->cdev->dev, "Determining the size of the recorded "
-                "area...\n");
+        pr_info("%s: Determining the size of the recorded area...\n",
+                dev_name(&device->cdev->dev));
         DBF_LH(3, "Image file ends at %d\n", rc);
         nr_of_blks = rc;
 
@@ -330,8 +330,8 @@ tapeblock_revalidate_disk(struct gendisk *disk)
         device->bof = rc;
         nr_of_blks -= rc;
 
-        dev_info(&device->cdev->dev, "The size of the recorded area is %i "
-                "blocks\n", nr_of_blks);
+        pr_info("%s: The size of the recorded area is %i blocks\n",
+                dev_name(&device->cdev->dev), nr_of_blks);
         set_capacity(device->blk_data.disk,
                 nr_of_blks*(TAPEBLOCK_HSEC_SIZE/512));
 
@@ -366,8 +366,8 @@ tapeblock_open(struct block_device *bdev, fmode_t mode)
 
         if (device->required_tapemarks) {
                 DBF_EVENT(2, "TBLOCK: missing tapemarks\n");
-                dev_warn(&device->cdev->dev, "Opening the tape failed because"
-                        " of missing end-of-file marks\n");
+                pr_warning("%s: Opening the tape failed because of missing "
+                           "end-of-file marks\n", dev_name(&device->cdev->dev));
                 rc = -EPERM;
                 goto put_device;
         }
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 934a42ebe11..5cd31e07164 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -215,14 +215,14 @@ tape_med_state_set(struct tape_device *device, enum tape_medium_state newstate)
         case MS_UNLOADED:
                 device->tape_generic_status |= GMT_DR_OPEN(~0);
                 if (device->medium_state == MS_LOADED)
-                        dev_info(&device->cdev->dev, "The tape cartridge has "
-                                 "been successfully unloaded\n");
+                        pr_info("%s: The tape cartridge has been successfully "
+                                "unloaded\n", dev_name(&device->cdev->dev));
                 break;
         case MS_LOADED:
                 device->tape_generic_status &= ~GMT_DR_OPEN(~0);
                 if (device->medium_state == MS_UNLOADED)
-                        dev_info(&device->cdev->dev, "A tape cartridge has "
-                                 "been mounted\n");
+                        pr_info("%s: A tape cartridge has been mounted\n",
+                                dev_name(&device->cdev->dev));
                 break;
         default:
                 // print nothing
@@ -656,8 +656,8 @@ tape_generic_remove(struct ccw_device *cdev)
                          */
                         DBF_EVENT(3, "(%08x): Drive in use vanished!\n",
                                 device->cdev_id);
-                        dev_warn(&device->cdev->dev, "A tape unit was detached"
-                                " while in use\n");
+                        pr_warning("%s: A tape unit was detached while in "
+                                   "use\n", dev_name(&device->cdev->dev));
                         tape_state_set(device, TS_NOT_OPER);
                         __tape_discard_requests(device);
                         spin_unlock_irq(get_ccwdev_lock(device->cdev));