ide: remove ->INB, ->OUTB and ->OUTBSYNC methods

* Remove no longer needed ->INB, ->OUTB and ->OUTBSYNC methods.

Then:

* Remove no longer used default_hwif_[mm]iops() and ide_[mm_]outbsync().

* Cleanup SuperIO handling in ns87415.c.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4 files changed, 14 insertions, 49 deletions

diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index b9bb8428b35e..02fd3a877afa 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -28,10 +28,6 @@
  */
 #include <asm/superio.h>
 
-static unsigned long superio_ide_status[2];
-static unsigned long superio_ide_select[2];
-static unsigned long superio_ide_dma_status[2];
-
 #define SUPERIO_IDE_MAX_RETRIES 25
 
 /* Because of a defect in Super I/O, all reads of the PCI DMA status 
@@ -40,27 +36,18 @@ static unsigned long superio_ide_dma_status[2];
  */
 static u8 superio_ide_inb (unsigned long port)
 {
-        if (port == superio_ide_status[0] ||
-            port == superio_ide_status[1] ||
-            port == superio_ide_select[0] ||
-            port == superio_ide_select[1] ||
-            port == superio_ide_dma_status[0] ||
-            port == superio_ide_dma_status[1]) {
-                u8 tmp;
-                int retries = SUPERIO_IDE_MAX_RETRIES;
-
-                /* printk(" [ reading port 0x%x with retry ] ", port); */
+        u8 tmp;
+        int retries = SUPERIO_IDE_MAX_RETRIES;
 
-                do {
-                        tmp = inb(port);
-                        if (tmp == 0)
-                                udelay(50);
-                } while (tmp == 0 && retries-- > 0);
+        /* printk(" [ reading port 0x%x with retry ] ", port); */
 
-                return tmp;
-        }
+        do {
+                tmp = inb(port);
+                if (tmp == 0)
+                        udelay(50);
+        } while (tmp == 0 && retries-- > 0);
 
-        return inb(port);
+        return tmp;
 }
 
 static u8 superio_read_status(ide_hwif_t *hwif)
@@ -120,27 +107,20 @@ static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)
 static void __devinit superio_ide_init_iops (struct hwif_s *hwif)
 {
         struct pci_dev *pdev = to_pci_dev(hwif->dev);
-        u32 base, dmabase;
+        u32 dma_stat;
         u8 port = hwif->channel, tmp;
 
-        base = pci_resource_start(pdev, port * 2) & ~3;
-        dmabase = pci_resource_start(pdev, 4) & ~3;
-
-        superio_ide_status[port] = base + 7;
-        superio_ide_select[port] = base + 6;
-        superio_ide_dma_status[port] = dmabase + (!port ? 2 : 0xa);
+        dma_stat = (pci_resource_start(pdev, 4) & ~3) + (!port ? 2 : 0xa);
 
         /* Clear error/interrupt, enable dma */
-        tmp = superio_ide_inb(superio_ide_dma_status[port]);
-        outb(tmp | 0x66, superio_ide_dma_status[port]);
+        tmp = superio_ide_inb(dma_stat);
+        outb(tmp | 0x66, dma_stat);
 
         hwif->read_status         = superio_read_status;
         hwif->read_sff_dma_status = superio_read_sff_dma_status;
 
         hwif->tf_read = superio_tf_read;
 
-        /* We need to override inb to workaround a SuperIO errata */
-        hwif->INB = superio_ide_inb;
 }
 
 static void __devinit init_iops_ns87415(ide_hwif_t *hwif)
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index c110f359b03e..38765d9b0314 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -188,14 +188,6 @@ static void scc_ide_outb(u8 addr, unsigned long port)
         out_be32((void*)port, addr);
 }
 
-static void scc_ide_outbsync(ide_hwif_t *hwif, u8 addr, unsigned long port)
-{
-        out_be32((void*)port, addr);
-        eieio();
-        in_be32((void*)(hwif->dma_base + 0x01c));
-        eieio();
-}
-
 static void
 scc_ide_outsw(unsigned long port, void *addr, u32 count)
 {
@@ -829,10 +821,6 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
         hwif->input_data  = scc_input_data;
         hwif->output_data = scc_output_data;
 
-        hwif->INB = scc_ide_inb;
-        hwif->OUTB = scc_ide_outb;
-        hwif->OUTBSYNC = scc_ide_outbsync;
-
         hwif->dma_base = dma_base;
         hwif->config_data = ports->ctl;
 }
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 3005a6334a58..86f7c4901837 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -623,9 +623,6 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         if (hwif == NULL)
                 goto err;
 
-        /* The IOC4 uses MMIO rather than Port IO. */
-        default_hwif_mmiops(hwif);
-
         /* Initializing chipset IRQ Registers */
         writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4));
 
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 21d7137f7d6c..5965a35d94ae 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -601,7 +601,7 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
          *      Fill in the basic hwif bits
          */
         hwif->host_flags |= IDE_HFLAG_MMIO;
-        default_hwif_mmiops(hwif);
+
         hwif->hwif_data = addr;
 
         /*