s390/dasd: use new address translation helpers

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

diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 459b7f8..bbbacfc 100644 (file)
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -216,7 +216,7 @@ dasd_3990_erp_DCTL(struct dasd_ccw_req * erp, char modifier)
        memset(ccw, 0, sizeof(struct ccw1));
        ccw->cmd_code = CCW_CMD_DCTL;
        ccw->count = 4;
-       ccw->cda = (__u32)virt_to_phys(DCTL_data);
+       ccw->cda = virt_to_dma32(DCTL_data);
        dctl_cqr->flags = erp->flags;
        dctl_cqr->function = dasd_3990_erp_DCTL;
        dctl_cqr->refers = erp;
@@ -1589,7 +1589,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)
 {
 
        struct dasd_device *device = default_erp->startdev;
-       __u32 cpa = 0;
+       dma32_t cpa = 0;
        struct dasd_ccw_req *cqr;
        struct dasd_ccw_req *erp;
        struct DE_eckd_data *DE_data;
@@ -1693,7 +1693,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)
        ccw->cmd_code = DASD_ECKD_CCW_DEFINE_EXTENT;
        ccw->flags = CCW_FLAG_CC;
        ccw->count = 16;
-       ccw->cda = (__u32)virt_to_phys(DE_data);
+       ccw->cda = virt_to_dma32(DE_data);
 
        /* create LO ccw */
        ccw++;
@@ -1701,7 +1701,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)
        ccw->cmd_code = DASD_ECKD_CCW_LOCATE_RECORD;
        ccw->flags = CCW_FLAG_CC;
        ccw->count = 16;
-       ccw->cda = (__u32)virt_to_phys(LO_data);
+       ccw->cda = virt_to_dma32(LO_data);
 
        /* TIC to the failed ccw */
        ccw++;
@@ -1747,7 +1747,7 @@ dasd_3990_update_1B(struct dasd_ccw_req * previous_erp, char *sense)
 {
 
        struct dasd_device *device = previous_erp->startdev;
-       __u32 cpa = 0;
+       dma32_t cpa = 0;
        struct dasd_ccw_req *cqr;
        struct dasd_ccw_req *erp;
        char *LO_data;          /* struct LO_eckd_data */
@@ -2386,7 +2386,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)
                tcw = erp->cpaddr;
                tsb = (struct tsb *) &tcw[1];
                *tcw = *((struct tcw *)cqr->cpaddr);
-               tcw->tsb = virt_to_phys(tsb);
+               tcw->tsb = virt_to_dma64(tsb);
        } else if (ccw->cmd_code == DASD_ECKD_CCW_PSF) {
                /* PSF cannot be chained from NOOP/TIC */
                erp->cpaddr = cqr->cpaddr;
@@ -2397,7 +2397,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)
                ccw->flags = CCW_FLAG_CC;
                ccw++;
                ccw->cmd_code = CCW_CMD_TIC;
-               ccw->cda      = (__u32)virt_to_phys(cqr->cpaddr);
+               ccw->cda      = virt_to_dma32(cqr->cpaddr);
        }
 
        erp->flags = cqr->flags;