1 files changed, 15 insertions, 62 deletions

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 05db429a7da8..634e3f6a9608 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -339,7 +339,8 @@ static int ide_pci_check_iomem(struct pci_dev *dev, const struct ide_port_info *
  *      ide_hwif_configure      -       configure an IDE interface
  *      @dev: PCI device holding interface
  *      @d: IDE port info
- *      @mate: Paired interface if any
+ *      @port: port number
+ *      @irq: PCI IRQ
  *
  *      Perform the initial set up for the hardware interface structure. This
  *      is done per interface port rather than per PCI device. There may be
@@ -348,7 +349,9 @@ static int ide_pci_check_iomem(struct pci_dev *dev, const struct ide_port_info *
  *      Returns the new hardware interface structure, or NULL on a failure
  */
 
-static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, const struct ide_port_info *d, ide_hwif_t *mate, int port, int irq)
+static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev,
+                                      const struct ide_port_info *d,
+                                      unsigned int port, int irq)
 {
         unsigned long ctl = 0, base = 0;
         ide_hwif_t *hwif;
@@ -394,29 +397,24 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, const struct ide_port
 
         hwif->dev = &dev->dev;
         hwif->cds = d;
-        hwif->channel = port;
 
-        if (mate) {
-                hwif->mate = mate;
-                mate->mate = hwif;
-        }
         return hwif;
 }
 
+#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 /**
  *      ide_hwif_setup_dma      -       configure DMA interface
- *      @dev: PCI device
- *      @d: IDE port info
  *      @hwif: IDE interface
+ *      @d: IDE port info
  *
  *      Set up the DMA base for the interface. Enable the master bits as
  *      necessary and attempt to bring the device DMA into a ready to use
  *      state
  */
 
-static void ide_hwif_setup_dma(struct pci_dev *dev, const struct ide_port_info *d, ide_hwif_t *hwif)
+void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
 {
-#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u16 pcicmd;
 
         pci_read_config_word(dev, PCI_COMMAND, &pcicmd);
@@ -448,8 +446,8 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, const struct ide_port_info *
                                 "(BIOS)\n", hwif->name, d->name);
                 }
         }
-#endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/
 }
+#endif /* CONFIG_BLK_DEV_IDEDMA_PCI */
 
 /**
  *      ide_setup_pci_controller        -       set up IDE PCI
@@ -511,7 +509,7 @@ out:
 void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d, int pciirq, u8 *idx)
 {
         int channels = (d->host_flags & IDE_HFLAG_SINGLE) ? 1 : 2, port;
-        ide_hwif_t *hwif, *mate = NULL;
+        ide_hwif_t *hwif;
         u8 tmp;
 
         /*
@@ -527,56 +525,11 @@ void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d, int
                         continue;       /* port not enabled */
                 }
 
-                if ((hwif = ide_hwif_configure(dev, d, mate, port, pciirq)) == NULL)
+                hwif = ide_hwif_configure(dev, d, port, pciirq);
+                if (hwif == NULL)
                         continue;
 
                 *(idx + port) = hwif->index;
-
-                if (d->init_iops)
-                        d->init_iops(hwif);
-
-                if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0)
-                        ide_hwif_setup_dma(dev, d, hwif);
-
-                if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
-                    (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
-                        hwif->irq = port ? 15 : 14;
-
-                hwif->host_flags = d->host_flags;
-                hwif->pio_mask = d->pio_mask;
-
-                if ((d->host_flags & IDE_HFLAG_SERIALIZE) && hwif->mate)
-                        hwif->mate->serialized = hwif->serialized = 1;
-
-                if (d->host_flags & IDE_HFLAG_IO_32BIT) {
-                        hwif->drives[0].io_32bit = 1;
-                        hwif->drives[1].io_32bit = 1;
-                }
-
-                if (d->host_flags & IDE_HFLAG_UNMASK_IRQS) {
-                        hwif->drives[0].unmask = 1;
-                        hwif->drives[1].unmask = 1;
-                }
-
-                if (hwif->dma_base) {
-                        hwif->swdma_mask = d->swdma_mask;
-                        hwif->mwdma_mask = d->mwdma_mask;
-                        hwif->ultra_mask = d->udma_mask;
-                }
-
-                hwif->drives[0].autotune = 1;
-                hwif->drives[1].autotune = 1;
-
-                if (d->host_flags & IDE_HFLAG_RQSIZE_256)
-                        hwif->rqsize = 256;
-
-                if (d->init_hwif)
-                        /* Call chipset-specific routine
-                         * for each enabled hwif
-                         */
-                        d->init_hwif(hwif);
-
-                mate = hwif;
         }
 }
 
@@ -658,7 +611,7 @@ int ide_setup_pci_device(struct pci_dev *dev, const struct ide_port_info *d)
         ret = do_ide_setup_pci_device(dev, d, &idx[0], 1);
 
         if (ret >= 0)
-                ide_device_add(idx);
+                ide_device_add(idx, d);
 
         return ret;
 }
@@ -682,7 +635,7 @@ int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2,
                         goto out;
         }
 
-        ide_device_add(idx);
+        ide_device_add(idx, d);
 out:
         return ret;
 }