1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 5a9b24950f99..1830e9166943 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -88,7 +88,7 @@ static struct ata_port_operations pcmcia_port_ops = {
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
 
-        .data_xfer      = ata_pio_data_xfer_noirq,
+        .data_xfer      = ata_data_xfer_noirq,
 
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
@@ -121,6 +121,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
         cistpl_cftable_entry_t *cfg;
         int pass, last_ret = 0, last_fn = 0, is_kme = 0, ret = -ENOMEM;
         unsigned long io_base, ctl_base;
+        void __iomem *io_addr, *ctl_addr;
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL)
@@ -231,10 +232,17 @@ next_entry:
         CS_CHECK(RequestIRQ, pcmcia_request_irq(pdev, &pdev->irq));
         CS_CHECK(RequestConfiguration, pcmcia_request_configuration(pdev, &pdev->conf));
 
+        /* iomap */
+        ret = -ENOMEM;
+        io_addr = devm_ioport_map(&pdev->dev, io_base, 8);
+        ctl_addr = devm_ioport_map(&pdev->dev, ctl_base, 1);
+        if (!io_addr || !ctl_addr)
+                goto failed;
+
         /* Success. Disable the IRQ nIEN line, do quirks */
-        outb(0x02, ctl_base);
+        iowrite8(0x02, ctl_addr);
         if (is_kme)
-                outb(0x81, ctl_base + 0x01);
+                iowrite8(0x81, ctl_addr + 0x01);
 
         /* FIXME: Could be more ports at base + 0x10 but we only deal with
            one right now */
@@ -256,11 +264,12 @@ next_entry:
         ae.irq = pdev->irq.AssignedIRQ;
         ae.irq_flags = SA_SHIRQ;
         ae.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
-        ae.port[0].cmd_addr = io_base;
-        ae.port[0].altstatus_addr = ctl_base;
-        ae.port[0].ctl_addr = ctl_base;
+        ae.port[0].cmd_addr = io_addr;
+        ae.port[0].altstatus_addr = ctl_addr;
+        ae.port[0].ctl_addr = ctl_addr;
         ata_std_ports(&ae.port[0]);
 
+        ret = -ENODEV;
         if (ata_device_add(&ae) == 0)
                 goto failed;