Merge tag 'x86-asm-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-block.git] / drivers / s390 / block / dasd_erp.c

diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index c07e6e71351835eaf298cd30ba9281a1ef01004d..4c0d3a704513cc9f602317ed899e961d2a842701 100644 (file)
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -9,8 +9,6 @@
  *
  */
 
-#define KMSG_COMPONENT "dasd"
-
 #include <linux/ctype.h>
 #include <linux/init.h>
 
@@ -18,9 +16,6 @@
 #include <asm/ebcdic.h>
 #include <linux/uaccess.h>
 
-/* This is ugly... */
-#define PRINTK_HEADER "dasd_erp:"
-
 #include "dasd_int.h"
 
 struct dasd_ccw_req *
@@ -170,12 +165,12 @@ dasd_log_sense(struct dasd_ccw_req *cqr, struct irb *irb)
        device = cqr->startdev;
        if (cqr->intrc == -ETIMEDOUT) {
                dev_err(&device->cdev->dev,
-                       "A timeout error occurred for cqr %p\n", cqr);
+                       "A timeout error occurred for cqr %px\n", cqr);
                return;
        }
        if (cqr->intrc == -ENOLINK) {
                dev_err(&device->cdev->dev,
-                       "A transport error occurred for cqr %p\n", cqr);
+                       "A transport error occurred for cqr %px\n", cqr);
                return;
        }
        /* dump sense data */