1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index 9f8ec576317c..b56dc4a7185b 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -263,26 +263,26 @@ static void hpt3x2n_bmdma_stop(struct ata_queued_cmd *qc)
 
 static void hpt3x2n_set_clock(struct ata_port *ap, int source)
 {
-        unsigned long bmdma = ap->ioaddr.bmdma_addr;
+        void __iomem *bmdma = ap->ioaddr.bmdma_addr;
 
         /* Tristate the bus */
-        outb(0x80, bmdma+0x73);
-        outb(0x80, bmdma+0x77);
+        iowrite8(0x80, bmdma+0x73);
+        iowrite8(0x80, bmdma+0x77);
 
         /* Switch clock and reset channels */
-        outb(source, bmdma+0x7B);
-        outb(0xC0, bmdma+0x79);
+        iowrite8(source, bmdma+0x7B);
+        iowrite8(0xC0, bmdma+0x79);
 
         /* Reset state machines */
-        outb(0x37, bmdma+0x70);
-        outb(0x37, bmdma+0x74);
+        iowrite8(0x37, bmdma+0x70);
+        iowrite8(0x37, bmdma+0x74);
 
         /* Complete reset */
-        outb(0x00, bmdma+0x79);
+        iowrite8(0x00, bmdma+0x79);
 
         /* Reconnect channels to bus */
-        outb(0x00, bmdma+0x73);
-        outb(0x00, bmdma+0x77);
+        iowrite8(0x00, bmdma+0x73);
+        iowrite8(0x00, bmdma+0x77);
 }
 
 /* Check if our partner interface is busy */
@@ -373,7 +373,7 @@ static struct ata_port_operations hpt3x2n_port_ops = {
         .qc_prep        = ata_qc_prep,
         .qc_issue       = hpt3x2n_qc_issue_prot,
 
-        .data_xfer      = ata_pio_data_xfer,
+        .data_xfer      = ata_data_xfer,
 
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,