3 files changed, 20 insertions, 34 deletions

diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 17d35ca61351..4fb43206621a 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -106,18 +106,6 @@ static void cs5520_set_dma_mode(ide_drive_t *drive, const u8 speed)
 }
 
 /*
- *      We provide a callback for our nonstandard DMA location
- */
-
-static void __devinit cs5520_init_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif)
-{
-        unsigned long bmide = pci_resource_start(dev, 2);       /* Not the usual 4 */
-        if(hwif->mate && hwif->mate->dma_base)  /* Second channel at primary + 8 */
-                bmide += 8;
-        ide_setup_dma(hwif, bmide, 8);
-}
-
-/*
  *      We wrap the DMA activate to set the vdma flag. This is needed
  *      so that the IDE DMA layer issues PIO not DMA commands over the
  *      DMA channel
@@ -150,9 +138,9 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
 #define DECLARE_CS_DEV(name_str)                                \
         {                                                       \
                 .name           = name_str,                     \
-                .init_setup_dma = cs5520_init_setup_dma,        \
                 .init_hwif      = init_hwif_cs5520,             \
                 .host_flags     = IDE_HFLAG_ISA_PORTS |         \
+                                  IDE_HFLAG_CS5520 |            \
                                   IDE_HFLAG_VDMA |              \
                                   IDE_HFLAG_NO_ATAPI_DMA |      \
                                   IDE_HFLAG_BOOTABLE,           \
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 26061fe1b712..479add4af499 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -147,6 +147,7 @@ static int ide_setup_pci_baseregs (struct pci_dev *dev, const char *name)
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 /**
  *      ide_get_or_set_dma_base         -       setup BMIBA
+ *      @d: IDE pci device data
  *      @hwif: Interface
  *
  *      Fetch the DMA Bus-Master-I/O-Base-Address (BMIBA) from PCI space.
@@ -154,7 +155,7 @@ static int ide_setup_pci_baseregs (struct pci_dev *dev, const char *name)
  *      and enforce IDE simplex rules.
  */
 
-static unsigned long ide_get_or_set_dma_base (ide_hwif_t *hwif)
+static unsigned long ide_get_or_set_dma_base(ide_pci_device_t *d, ide_hwif_t *hwif)
 {
         unsigned long   dma_base = 0;
         struct pci_dev  *dev = hwif->pci_dev;
@@ -165,14 +166,15 @@ static unsigned long ide_get_or_set_dma_base (ide_hwif_t *hwif)
         if (hwif->mate && hwif->mate->dma_base) {
                 dma_base = hwif->mate->dma_base - (hwif->channel ? 0 : 8);
         } else {
-                dma_base = pci_resource_start(dev, 4);
-                if (!dma_base) {
-                        printk(KERN_ERR "%s: dma_base is invalid\n",
-                                        hwif->cds->name);
-                }
+                u8 baridx = (d->host_flags & IDE_HFLAG_CS5520) ? 2 : 4;
+
+                dma_base = pci_resource_start(dev, baridx);
+
+                if (dma_base == 0)
+                        printk(KERN_ERR "%s: DMA base is invalid\n", d->name);
         }
 
-        if (dma_base) {
+        if ((d->host_flags & IDE_HFLAG_CS5520) == 0 && dma_base) {
                 u8 simplex_stat = 0;
                 dma_base += hwif->channel ? 8 : 0;
 
@@ -188,8 +190,8 @@ static unsigned long ide_get_or_set_dma_base (ide_hwif_t *hwif)
                                 simplex_stat = hwif->INB(dma_base + 2);
                                 if (simplex_stat & 0x80) {
                                         printk(KERN_INFO "%s: simplex device: "
-                                                "DMA forced\n",
-                                                hwif->cds->name);
+                                                         "DMA forced\n",
+                                                         d->name);
                                 }
                                 break;
                         default:
@@ -212,8 +214,8 @@ static unsigned long ide_get_or_set_dma_base (ide_hwif_t *hwif)
  */
                                         if (hwif->mate && hwif->mate->dma_base) {
                                                 printk(KERN_INFO "%s: simplex device: "
-                                                        "DMA disabled\n",
-                                                        hwif->cds->name);
+                                                                 "DMA disabled\n",
+                                                                 d->name);
                                                 dma_base = 0;
                                         }
                                 }
@@ -434,7 +436,7 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi
         if ((d->host_flags & IDE_HFLAG_NO_AUTODMA) == 0 ||
             ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE &&
              (dev->class & 0x80))) {
-                unsigned long dma_base = ide_get_or_set_dma_base(hwif);
+                unsigned long dma_base = ide_get_or_set_dma_base(d, hwif);
                 if (dma_base && !(pcicmd & PCI_COMMAND_MASTER)) {
                         /*
                          * Set up BM-DMA capability
@@ -559,14 +561,9 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                 if (d->init_iops)
                         d->init_iops(hwif);
 
-                if (d->host_flags & IDE_HFLAG_NO_DMA)
-                        goto bypass_legacy_dma;
-
-                if(d->init_setup_dma)
-                        d->init_setup_dma(dev, d, hwif);
-                else
+                if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0)
                         ide_hwif_setup_dma(dev, d, hwif);
-bypass_legacy_dma:
+
                 hwif->host_flags = d->host_flags;
                 hwif->pio_mask = d->pio_mask;
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 6f375e044c3e..b721f0b379f6 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1252,6 +1252,8 @@ enum {
         IDE_HFLAG_NO_DMA                = (1 << 14),
         /* check if host is PCI IDE device before allowing DMA */
         IDE_HFLAG_NO_AUTODMA            = (1 << 15),
+        /* host is CS5510/CS5520 */
+        IDE_HFLAG_CS5520                = (1 << 16),
 };
 
 #ifdef CONFIG_BLK_DEV_OFFBOARD
@@ -1263,7 +1265,6 @@ enum {
 typedef struct ide_pci_device_s {
         char                    *name;
         int                     (*init_setup)(struct pci_dev *, struct ide_pci_device_s *);
-        void                    (*init_setup_dma)(struct pci_dev *, struct ide_pci_device_s *, ide_hwif_t *);
         unsigned int            (*init_chipset)(struct pci_dev *, const char *);
         void                    (*init_iops)(ide_hwif_t *);
         void                    (*init_hwif)(ide_hwif_t *);
@@ -1272,7 +1273,7 @@ typedef struct ide_pci_device_s {
         ide_pci_enablebit_t     enablebits[2];
         unsigned int            extra;
         struct ide_pci_device_s *next;
-        u16                     host_flags;
+        u32                     host_flags;
         u8                      pio_mask;
         u8                      udma_mask;
 } ide_pci_device_t;