1 files changed, 6 insertions, 12 deletions

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index c88d33225cf9..30e596c0f120 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -5,12 +5,6 @@
  *
  *  Copyright (c) 1995-1998  Mark Lord
  *  May be copied or modified under the terms of the GNU General Public License
- *
- *  Recent Changes
- *      Split the set up function into multiple functions
- *      Use pci_set_master
- *      Fix misreporting of I/O v MMIO problems
- *      Initial fixups for simplex devices
  */
 
 /*
@@ -407,7 +401,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
         unsigned long ctl = 0, base = 0;
         ide_hwif_t *hwif;
 
-        if ((d->flags & IDEPCI_FLAG_ISA_PORTS) == 0) {
+        if ((d->host_flags & IDE_HFLAG_ISA_PORTS) == 0) {
                 /*  Possibly we should fail if these checks report true */
                 ide_pci_check_iomem(dev, d, 2*port);
                 ide_pci_check_iomem(dev, d, 2*port+1);
@@ -571,7 +565,7 @@ out:
  
 void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, ata_index_t *index)
 {
-        int port;
+        int channels = (d->host_flags & IDE_HFLAG_SINGLE) ? 1 : 2, port;
         int at_least_one_hwif_enabled = 0;
         ide_hwif_t *hwif, *mate = NULL;
         u8 tmp;
@@ -582,16 +576,13 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
          * Set up the IDE ports
          */
          
-        for (port = 0; port <= 1; ++port) {
+        for (port = 0; port < channels; ++port) {
                 ide_pci_enablebit_t *e = &(d->enablebits[port]);
         
                 if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
                     (tmp & e->mask) != e->val))
                         continue;       /* port not enabled */
 
-                if (d->channels <= port)
-                        break;
-        
                 if ((hwif = ide_hwif_configure(dev, d, mate, port, pciirq)) == NULL)
                         continue;
 
@@ -616,6 +607,9 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                 else
                         ide_hwif_setup_dma(dev, d, hwif);
 bypass_legacy_dma:
+                hwif->host_flags = d->host_flags;
+                hwif->pio_mask = d->pio_mask;
+
                 if (d->init_hwif)
                         /* Call chipset-specific routine
                          * for each enabled hwif