1 files changed, 14 insertions, 11 deletions

diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 4ea42838297e..d5483087a3fa 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -46,15 +46,16 @@ enum {
         SECONDARY = (1 << 14)
 };
 
-static int mpiix_pre_reset(struct ata_port *ap, unsigned long deadline)
+static int mpiix_pre_reset(struct ata_link *link, unsigned long deadline)
 {
+        struct ata_port *ap = link->ap;
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         static const struct pci_bits mpiix_enable_bits = { 0x6D, 1, 0x80, 0x80 };
 
         if (!pci_test_config_bits(pdev, &mpiix_enable_bits))
                 return -ENOENT;
 
-        return ata_std_prereset(ap, deadline);
+        return ata_std_prereset(link, deadline);
 }
 
 /**
@@ -168,7 +169,6 @@ static struct scsi_host_template mpiix_sht = {
 };
 
 static struct ata_port_operations mpiix_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = mpiix_set_piomode,
 
         .tf_load        = ata_tf_load,
@@ -189,9 +189,8 @@ static struct ata_port_operations mpiix_port_ops = {
 
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
-        .port_start     = ata_port_start,
+        .port_start     = ata_sff_port_start,
 };
 
 static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
@@ -202,7 +201,7 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         struct ata_port *ap;
         void __iomem *cmd_addr, *ctl_addr;
         u16 idetim;
-        int irq;
+        int cmd, ctl, irq;
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
@@ -210,6 +209,7 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         host = ata_host_alloc(&dev->dev, 1);
         if (!host)
                 return -ENOMEM;
+        ap = host->ports[0];
 
         /* MPIIX has many functions which can be turned on or off according
            to other devices present. Make sure IDE is enabled before we try
@@ -221,25 +221,28 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 
         /* See if it's primary or secondary channel... */
         if (!(idetim & SECONDARY)) {
+                cmd = 0x1F0;
+                ctl = 0x3F6;
                 irq = 14;
-                cmd_addr = devm_ioport_map(&dev->dev, 0x1F0, 8);
-                ctl_addr = devm_ioport_map(&dev->dev, 0x3F6, 1);
         } else {
+                cmd = 0x170;
+                ctl = 0x376;
                 irq = 15;
-                cmd_addr = devm_ioport_map(&dev->dev, 0x170, 8);
-                ctl_addr = devm_ioport_map(&dev->dev, 0x376, 1);
         }
 
+        cmd_addr = devm_ioport_map(&dev->dev, cmd, 8);
+        ctl_addr = devm_ioport_map(&dev->dev, ctl, 1);
         if (!cmd_addr || !ctl_addr)
                 return -ENOMEM;
 
+        ata_port_desc(ap, "cmd 0x%x ctl 0x%x", cmd, ctl);
+
         /* We do our own plumbing to avoid leaking special cases for whacko
            ancient hardware into the core code. There are two issues to
            worry about.  #1 The chip is a bridge so if in legacy mode and
            without BARs set fools the setup.  #2 If you pci_disable_device
            the MPIIX your box goes castors up */
 
-        ap = host->ports[0];
         ap->ops = &mpiix_port_ops;
         ap->pio_mask = 0x1F;
         ap->flags |= ATA_FLAG_SLAVE_POSS;