1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index fb7f3bdc6604..eb748507c7fa 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -479,19 +479,19 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                             "No memory to dump sense data");
                 return;
         }
-        len = sprintf(page, KERN_ERR PRINTK_HEADER
+        len = sprintf(page, PRINTK_HEADER
                       " I/O status report for device %s:\n",
                       dev_name(&device->cdev->dev));
-        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+        len += sprintf(page + len, PRINTK_HEADER
                        " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
                        irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
-        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+        len += sprintf(page + len, PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
                        dev_name(&device->cdev->dev),
                        (void *) (addr_t) irb->scsw.cmd.cpa);
         if (irb->esw.esw0.erw.cons) {
                 for (sl = 0; sl < 4; sl++) {
-                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                        len += sprintf(page + len, PRINTK_HEADER
                                        " Sense(hex) %2d-%2d:",
                                        (8 * sl), ((8 * sl) + 7));
 
@@ -502,7 +502,7 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                         len += sprintf(page + len, "\n");
                 }
         } else {
-                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                len += sprintf(page + len, PRINTK_HEADER
                                " SORRY - NO VALID SENSE AVAILABLE\n");
         }
         printk(KERN_ERR "%s", page);
@@ -512,10 +512,9 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
         act = req->cpaddr;
         for (last = act; last->flags & (CCW_FLAG_CC | CCW_FLAG_DC); last++);
         end = min(act + 8, last);
-        len = sprintf(page, KERN_ERR PRINTK_HEADER
-                      " Related CP in req: %p\n", req);
+        len = sprintf(page, PRINTK_HEADER " Related CP in req: %p\n", req);
         while (act <= end) {
-                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                len += sprintf(page + len, PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",
                                act, ((int *) act)[0], ((int *) act)[1]);
                 for (count = 0; count < 32 && count < act->count;
@@ -533,11 +532,11 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
         len = 0;
         if (act <  ((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa) - 2) {
                 act = ((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa) - 2;
-                len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
+                len += sprintf(page + len, PRINTK_HEADER "......\n");
         }
         end = min((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa + 2, last);
         while (act <= end) {
-                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                len += sprintf(page + len, PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",
                                act, ((int *) act)[0], ((int *) act)[1]);
                 for (count = 0; count < 32 && count < act->count;
@@ -552,10 +551,10 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
         /* print last CCWs */
         if (act <  last - 2) {
                 act = last - 2;
-                len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
+                len += sprintf(page + len, PRINTK_HEADER "......\n");
         }
         while (act <= last) {
-                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                len += sprintf(page + len, PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",
                                act, ((int *) act)[0], ((int *) act)[1]);
                 for (count = 0; count < 32 && count < act->count;