diff options
Diffstat (limited to 'drivers/s390/block/dasd_eckd.c')
-rw-r--r-- | drivers/s390/block/dasd_eckd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 773b3fe275b2..72d3970f11a4 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c | |||
@@ -84,7 +84,7 @@ dasd_eckd_probe (struct ccw_device *cdev) | |||
84 | if (ret) { | 84 | if (ret) { |
85 | printk(KERN_WARNING | 85 | printk(KERN_WARNING |
86 | "dasd_eckd_probe: could not set ccw-device options " | 86 | "dasd_eckd_probe: could not set ccw-device options " |
87 | "for %s\n", cdev->dev.bus_id); | 87 | "for %s\n", dev_name(&cdev->dev)); |
88 | return ret; | 88 | return ret; |
89 | } | 89 | } |
90 | ret = dasd_generic_probe(cdev, &dasd_eckd_discipline); | 90 | ret = dasd_generic_probe(cdev, &dasd_eckd_discipline); |
@@ -2145,13 +2145,13 @@ static void dasd_eckd_dump_sense(struct dasd_device *device, | |||
2145 | /* dump the sense data */ | 2145 | /* dump the sense data */ |
2146 | len = sprintf(page, KERN_ERR PRINTK_HEADER | 2146 | len = sprintf(page, KERN_ERR PRINTK_HEADER |
2147 | " I/O status report for device %s:\n", | 2147 | " I/O status report for device %s:\n", |
2148 | device->cdev->dev.bus_id); | 2148 | dev_name(&device->cdev->dev)); |
2149 | len += sprintf(page + len, KERN_ERR PRINTK_HEADER | 2149 | len += sprintf(page + len, KERN_ERR PRINTK_HEADER |
2150 | " in req: %p CS: 0x%02X DS: 0x%02X\n", req, | 2150 | " in req: %p CS: 0x%02X DS: 0x%02X\n", req, |
2151 | irb->scsw.cmd.cstat, irb->scsw.cmd.dstat); | 2151 | irb->scsw.cmd.cstat, irb->scsw.cmd.dstat); |
2152 | len += sprintf(page + len, KERN_ERR PRINTK_HEADER | 2152 | len += sprintf(page + len, KERN_ERR PRINTK_HEADER |
2153 | " device %s: Failing CCW: %p\n", | 2153 | " device %s: Failing CCW: %p\n", |
2154 | device->cdev->dev.bus_id, | 2154 | dev_name(&device->cdev->dev), |
2155 | (void *) (addr_t) irb->scsw.cmd.cpa); | 2155 | (void *) (addr_t) irb->scsw.cmd.cpa); |
2156 | if (irb->esw.esw0.erw.cons) { | 2156 | if (irb->esw.esw0.erw.cons) { |
2157 | for (sl = 0; sl < 4; sl++) { | 2157 | for (sl = 0; sl < 4; sl++) { |