s390/dasd: use new address translation helpers

[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 cead018..0a97cfe 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3976,7 +3976,7 @@ static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device,
 
        ccw = cqr->cpaddr;
        ccw->cmd_code = CCW_CMD_RDC;
-       ccw->cda = (__u32)virt_to_phys(cqr->data);
+       ccw->cda = virt_to_dma32(cqr->data);
        ccw->flags = 0;
        ccw->count = rdc_buffer_size;
        cqr->startdev = device;
@@ -4020,7 +4020,7 @@ char *dasd_get_sense(struct irb *irb)
 
        if (scsw_is_tm(&irb->scsw) && (irb->scsw.tm.fcxs == 0x01)) {
                if (irb->scsw.tm.tcw)
-                       tsb = tcw_get_tsb(phys_to_virt(irb->scsw.tm.tcw));
+                       tsb = tcw_get_tsb(dma32_to_virt(irb->scsw.tm.tcw));
                if (tsb && tsb->length == 64 && tsb->flags)
                        switch (tsb->flags & 0x07) {
                        case 1: /* tsa_iostat */