Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / s390 / block / dasd_erp.c

diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index d970ce2..7656384 100644 (file)
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -99,8 +99,8 @@ dasd_default_erp_action(struct dasd_ccw_req *cqr)
                cqr->lpm    = LPM_ANYPATH;
                cqr->status = DASD_CQR_FILLED;
         } else {
-               dev_err(&device->cdev->dev,
-                       "default ERP has run out of retries and failed\n");
+               pr_err("%s: default ERP has run out of retries and failed\n",
+                      dev_name(&device->cdev->dev));
                cqr->status = DASD_CQR_FAILED;
                cqr->stopclk = get_clock();
         }
@@ -172,7 +172,7 @@ dasd_log_sense_dbf(struct dasd_ccw_req *cqr, struct irb *irb)
        device = cqr->startdev;
        /* dump sense data to s390 debugfeature*/
        if (device->discipline && device->discipline->dump_sense_dbf)
-               device->discipline->dump_sense_dbf(device, cqr, irb, "log");
+               device->discipline->dump_sense_dbf(device, irb, "log");
 }
 EXPORT_SYMBOL(dasd_log_sense_dbf);