patch-2.4.15 linux/drivers/s390/block/dasd_3990_erp.c

• Lines: 94
• Date: Fri Nov 9 14:05:02 2001
• Orig file: v2.4.14/linux/drivers/s390/block/dasd_3990_erp.c
• Orig date: Tue Oct 23 22:48:52 2001

diff -u --recursive --new-file v2.4.14/linux/drivers/s390/block/dasd_3990_erp.c linux/drivers/s390/block/dasd_3990_erp.c
@@ -55,7 +55,7 @@
         while (loop_cqr != NULL) {
                 
                 DASD_MESSAGE (KERN_ERR, device, 
-                              "(%s) ERP chain report for req: %p\n",
+                              "(%s) ERP chain report for req: %p",
                               caller == 0 ? "EXAMINE" : "ACTION",
                               loop_cqr);
                 
@@ -66,7 +66,7 @@
                         
                         DASD_MESSAGE (KERN_ERR, device, 
                                       "%p: %02x%02x%02x%02x %02x%02x%02x%02x "
-                                      "%02x%02x%02x%02x %02x%02x%02x%02x\n",
+                                      "%02x%02x%02x%02x %02x%02x%02x%02x",
                                       nl,
                                       nl[0], nl[1], nl[2], nl[3],
                                       nl[4], nl[5], nl[6], nl[7],
@@ -80,13 +80,13 @@
                 if (loop_cqr->cplength > 40) { /* log only parts of the CP */
 
                         DASD_MESSAGE (KERN_ERR, device, "%s",
-                                      "Start of channel program:\n");
+                                      "Start of channel program:");
                         
                         for (i = 0; i < 20; i += 2) { 
                                 
                                 DASD_MESSAGE (KERN_ERR, device, 
                                               "%p: %02x%02x%02x%02x %02x%02x%02x%02x "
-                                              "%02x%02x%02x%02x %02x%02x%02x%02x\n",
+                                              "%02x%02x%02x%02x %02x%02x%02x%02x",
                                               nl,
                                               nl[0], nl[1], nl[2], nl[3],
                                               nl[4], nl[5], nl[6], nl[7],
@@ -97,7 +97,7 @@
                         }
                         
                         DASD_MESSAGE (KERN_ERR, device, "%s",
-                                      "End of channel program:\n");
+                                      "End of channel program:");
                         
                         nl  = (char *) loop_cqr->cpaddr;
                         nl  += ((loop_cqr->cplength - 10) * 8);
@@ -106,7 +106,7 @@
                                 
                                 DASD_MESSAGE (KERN_ERR, device, 
                                               "%p: %02x%02x%02x%02x %02x%02x%02x%02x "
-                                              "%02x%02x%02x%02x %02x%02x%02x%02x\n",
+                                              "%02x%02x%02x%02x %02x%02x%02x%02x",
                                               nl,
                                               nl[0], nl[1], nl[2], nl[3],
                                               nl[4], nl[5], nl[6], nl[7],
@@ -119,13 +119,13 @@
                 } else { /* log the whole CP */
                         
                         DASD_MESSAGE (KERN_ERR, device, "%s",
-                                      "Channel program (complete):\n");
+                                      "Channel program (complete):");
                         
                         for (i = 0; i < (loop_cqr->cplength + 4); i += 2) { 
                                 
                                 DASD_MESSAGE (KERN_ERR, device, 
                                               "%p: %02x%02x%02x%02x %02x%02x%02x%02x "
-                                              "%02x%02x%02x%02x %02x%02x%02x%02x\n",
+                                              "%02x%02x%02x%02x %02x%02x%02x%02x",
                                               nl,
                                               nl[0], nl[1], nl[2], nl[3],
                                               nl[4], nl[5], nl[6], nl[7],
@@ -151,14 +151,14 @@
                                 nl -= 10*8;     /* start some bytes before */
                                 
                                 DASD_MESSAGE (KERN_ERR, device, 
-                                                "Failed CCW (%p) (area):\n",
+                                                "Failed CCW (%p) (area):",
                                                 (void *)(long)cpa);
                                 
                                 for (i = 0; i < 20; i += 2) { 
                                         
                                         DASD_MESSAGE (KERN_ERR, device, 
                                                       "%p: %02x%02x%02x%02x %02x%02x%02x%02x "
-                                                      "%02x%02x%02x%02x %02x%02x%02x%02x\n",
+                                                      "%02x%02x%02x%02x %02x%02x%02x%02x",
                                                       nl,
                                                       nl[0], nl[1], nl[2], nl[3],
                                                       nl[4], nl[5], nl[6], nl[7],
@@ -171,7 +171,7 @@
                         } else {
                                 
                                 DASD_MESSAGE (KERN_ERR, device, 
-                                              "Failed CCW (%p) already logged\n",
+                                              "Failed CCW (%p) already logged",
                                               (void *)(long)cpa);
                         }
                 }