1 files changed, 23 insertions, 14 deletions

diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index cf94e0158a8d..bb84ba0c7e83 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -42,6 +42,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -86,7 +87,7 @@ static u32 vsc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg)
 {
         if (sc_reg > SCR_CONTROL)
                 return 0xffffffffU;
-        return readl((void *) ap->ioaddr.scr_addr + (sc_reg * 4));
+        return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
 }
 
 
@@ -95,16 +96,16 @@ static void vsc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg,
 {
         if (sc_reg > SCR_CONTROL)
                 return;
-        writel(val, (void *) ap->ioaddr.scr_addr + (sc_reg * 4));
+        writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
 }
 
 
 static void vsc_intr_mask_update(struct ata_port *ap, u8 ctl)
 {
-        unsigned long mask_addr;
+        void __iomem *mask_addr;
         u8 mask;
 
-        mask_addr = (unsigned long) ap->host_set->mmio_base +
+        mask_addr = ap->host_set->mmio_base +
                 VSC_SATA_INT_MASK_OFFSET + ap->port_no;
         mask = readb(mask_addr);
         if (ctl & ATA_NIEN)
@@ -115,7 +116,7 @@ static void vsc_intr_mask_update(struct ata_port *ap, u8 ctl)
 }
 
 
-static void vsc_sata_tf_load(struct ata_port *ap, struct ata_taskfile *tf)
+static void vsc_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
 {
         struct ata_ioports *ioaddr = &ap->ioaddr;
         unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
@@ -153,16 +154,24 @@ static void vsc_sata_tf_load(struct ata_port *ap, struct ata_taskfile *tf)
 static void vsc_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
 {
         struct ata_ioports *ioaddr = &ap->ioaddr;
-        u16 nsect, lbal, lbam, lbah;
+        u16 nsect, lbal, lbam, lbah, feature;
 
-        nsect = tf->nsect = readw(ioaddr->nsect_addr);
-        lbal = tf->lbal = readw(ioaddr->lbal_addr);
-        lbam = tf->lbam = readw(ioaddr->lbam_addr);
-        lbah = tf->lbah = readw(ioaddr->lbah_addr);
+        tf->command = ata_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->feature = feature;
+        tf->nsect = nsect;
+        tf->lbal = lbal;
+        tf->lbam = lbam;
+        tf->lbah = lbah;
 
         if (tf->flags & ATA_TFLAG_LBA48) {
-                tf->hob_feature = readb(ioaddr->error_addr);
+                tf->hob_feature = feature >> 8;
                 tf->hob_nsect = nsect >> 8;
                 tf->hob_lbal = lbal >> 8;
                 tf->hob_lbam = lbam >> 8;
@@ -231,7 +240,7 @@ static Scsi_Host_Template vsc_sata_sht = {
 };
 
 
-static struct ata_port_operations vsc_sata_ops = {
+static const struct ata_port_operations vsc_sata_ops = {
         .port_disable           = ata_port_disable,
         .tf_load                = vsc_sata_tf_load,
         .tf_read                = vsc_sata_tf_read,
@@ -283,11 +292,11 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
         int pci_dev_busy = 0;
-        void *mmio_base;
+        void __iomem *mmio_base;
         int rc;
 
         if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
         rc = pci_enable_device(pdev);
         if (rc)