s390/dasd: Remove %p format specifier from error messages

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

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 7969730..b3cdf25 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1379,7 +1379,7 @@ int dasd_start_IO(struct dasd_ccw_req *cqr)
        }
        if (cqr->retries < 0) {
                dev_err(&device->cdev->dev,
-                       "Start I/O ran out of retries %p\n", cqr);
+                       "Start I/O ran out of retries\n");
                cqr->status = DASD_CQR_ERROR;
                return -EIO;
        }
@@ -1907,7 +1907,7 @@ static void __dasd_process_cqr(struct dasd_device *device,
                break;
        default:
                dev_err(&device->cdev->dev,
-                       "Unexpected CQR status %p %02x", cqr, cqr->status);
+                       "Unexpected CQR status %02x", cqr->status);
                BUG();
        }
        if (cqr->callback)
@@ -1972,16 +1972,14 @@ static void __dasd_device_check_expire(struct dasd_device *device)
                if (device->discipline->term_IO(cqr) != 0) {
                        /* Hmpf, try again in 5 sec */
                        dev_err(&device->cdev->dev,
-                               "cqr %p timed out (%lus) but cannot be "
-                               "ended, retrying in 5 s\n",
-                               cqr, (cqr->expires/HZ));
+                               "CQR timed out (%lus) but cannot be ended, retrying in 5s\n",
+                               (cqr->expires / HZ));
                        cqr->expires += 5*HZ;
                        dasd_device_set_timer(device, 5*HZ);
                } else {
                        dev_err(&device->cdev->dev,
-                               "cqr %p timed out (%lus), %i retries "
-                               "remaining\n", cqr, (cqr->expires/HZ),
-                               cqr->retries);
+                               "CQR timed out (%lus), %i retries remaining\n",
+                               (cqr->expires / HZ), cqr->retries);
                }
                __dasd_device_check_autoquiesce_timeout(device, cqr);
        }
@@ -2102,8 +2100,7 @@ int dasd_flush_device_queue(struct dasd_device *device)
                        if (rc) {
                                /* unable to terminate requeust */
                                dev_err(&device->cdev->dev,
-                                       "Flushing the DASD request queue "
-                                       "failed for request %p\n", cqr);
+                                       "Flushing the DASD request queue failed\n");
                                /* stop flush processing */
                                goto finished;
                        }
@@ -2619,8 +2616,7 @@ static int __dasd_cancel_req(struct dasd_ccw_req *cqr)
                rc = device->discipline->term_IO(cqr);
                if (rc) {
                        dev_err(&device->cdev->dev,
-                               "Cancelling request %p failed with rc=%d\n",
-                               cqr, rc);
+                               "Cancelling request failed with rc=%d\n", rc);
                } else {
                        cqr->stopclk = get_tod_clock();
                }