1 files changed, 23 insertions, 18 deletions

diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index d89c9590b845..46d8a94669b4 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -135,26 +135,31 @@ static void k2_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
         unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
 
         if (tf->ctl != ap->last_ctl) {
-                writeb(tf->ctl, ioaddr->ctl_addr);
+                writeb(tf->ctl, (void __iomem *) ioaddr->ctl_addr);
                 ap->last_ctl = tf->ctl;
                 ata_wait_idle(ap);
         }
         if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
-                writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr);
-                writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr);
-                writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr);
-                writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr);
-                writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr);
+                writew(tf->feature | (((u16)tf->hob_feature) << 8),
+                       (void __iomem *) ioaddr->feature_addr);
+                writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
+                       (void __iomem *) ioaddr->nsect_addr);
+                writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
+                       (void __iomem *) ioaddr->lbal_addr);
+                writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
+                       (void __iomem *) ioaddr->lbam_addr);
+                writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
+                       (void __iomem *) ioaddr->lbah_addr);
         } else if (is_addr) {
-                writew(tf->feature, ioaddr->feature_addr);
-                writew(tf->nsect, ioaddr->nsect_addr);
-                writew(tf->lbal, ioaddr->lbal_addr);
-                writew(tf->lbam, ioaddr->lbam_addr);
-                writew(tf->lbah, ioaddr->lbah_addr);
+                writew(tf->feature, (void __iomem *) ioaddr->feature_addr);
+                writew(tf->nsect, (void __iomem *) ioaddr->nsect_addr);
+                writew(tf->lbal, (void __iomem *) ioaddr->lbal_addr);
+                writew(tf->lbam, (void __iomem *) ioaddr->lbam_addr);
+                writew(tf->lbah, (void __iomem *) ioaddr->lbah_addr);
         }
 
         if (tf->flags & ATA_TFLAG_DEVICE)
-                writeb(tf->device, ioaddr->device_addr);
+                writeb(tf->device, (void __iomem *) ioaddr->device_addr);
 
         ata_wait_idle(ap);
 }
@@ -166,12 +171,12 @@ static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         u16 nsect, lbal, lbam, lbah, feature;
 
         tf->command = k2_stat_check_status(ap);
-        tf->device = readw(ioaddr->device_addr);
-        feature = readw(ioaddr->error_addr);
-        nsect = readw(ioaddr->nsect_addr);
-        lbal = readw(ioaddr->lbal_addr);
-        lbam = readw(ioaddr->lbam_addr);
-        lbah = readw(ioaddr->lbah_addr);
+        tf->device = readw((void __iomem *)ioaddr->device_addr);
+        feature = readw((void __iomem *)ioaddr->error_addr);
+        nsect = readw((void __iomem *)ioaddr->nsect_addr);
+        lbal = readw((void __iomem *)ioaddr->lbal_addr);
+        lbam = readw((void __iomem *)ioaddr->lbam_addr);
+        lbah = readw((void __iomem *)ioaddr->lbah_addr);
 
         tf->feature = feature;
         tf->nsect = nsect;