1 files changed, 19 insertions, 22 deletions

diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 24e440de4c8..9c490fd63fd 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -163,7 +163,7 @@ static void pdc202xx_quirkproc(ide_drive_t *drive)
         drive->quirk_list = 0;
 }
 
-static void pdc202xx_old_ide_dma_start(ide_drive_t *drive)
+static void pdc202xx_dma_start(ide_drive_t *drive)
 {
         if (drive->current_speed > XFER_UDMA_2)
                 pdc_old_enable_66MHz_clock(drive->hwif);
@@ -185,7 +185,7 @@ static void pdc202xx_old_ide_dma_start(ide_drive_t *drive)
         ide_dma_start(drive);
 }
 
-static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)
+static int pdc202xx_dma_end(ide_drive_t *drive)
 {
         if (drive->media != ide_disk || drive->addressing == 1) {
                 ide_hwif_t *hwif        = HWIF(drive);
@@ -202,7 +202,7 @@ static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)
         return __ide_dma_end(drive);
 }
 
-static int pdc202xx_old_ide_dma_test_irq(ide_drive_t *drive)
+static int pdc202xx_dma_test_irq(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         unsigned long high_16   = hwif->extra_base - 16;
@@ -263,23 +263,6 @@ static void pdc202xx_dma_timeout(ide_drive_t *drive)
         ide_dma_timeout(drive);
 }
 
-static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
-{
-        struct pci_dev *dev = to_pci_dev(hwif->dev);
-
-        if (hwif->dma_base == 0)
-                return;
-
-        hwif->dma_lost_irq = &pdc202xx_dma_lost_irq;
-        hwif->dma_timeout = &pdc202xx_dma_timeout;
-
-        if (dev->device != PCI_DEVICE_ID_PROMISE_20246) {
-                hwif->dma_start = &pdc202xx_old_ide_dma_start;
-                hwif->ide_dma_end = &pdc202xx_old_ide_dma_end;
-        } 
-        hwif->ide_dma_test_irq = &pdc202xx_old_ide_dma_test_irq;
-}
-
 static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,
                                                     const char *name)
 {
@@ -346,12 +329,26 @@ static const struct ide_port_ops pdc2026x_port_ops = {
         .cable_detect           = pdc2026x_cable_detect,
 };
 
+static struct ide_dma_ops pdc20246_dma_ops = {
+        .dma_test_irq           = pdc202xx_dma_test_irq,
+        .dma_lost_irq           = pdc202xx_dma_lost_irq,
+        .dma_timeout            = pdc202xx_dma_timeout,
+};
+
+static struct ide_dma_ops pdc2026x_dma_ops = {
+        .dma_start              = pdc202xx_dma_start,
+        .dma_end                = pdc202xx_dma_end,
+        .dma_test_irq           = pdc202xx_dma_test_irq,
+        .dma_lost_irq           = pdc202xx_dma_lost_irq,
+        .dma_timeout            = pdc202xx_dma_timeout,
+};
+
 #define DECLARE_PDC2026X_DEV(name_str, udma, extra_flags) \
         { \
                 .name           = name_str, \
                 .init_chipset   = init_chipset_pdc202xx, \
-                .init_hwif      = init_hwif_pdc202xx, \
                 .port_ops       = &pdc2026x_port_ops, \
+                .dma_ops        = &pdc2026x_dma_ops, \
                 .host_flags     = IDE_HFLAGS_PDC202XX | extra_flags, \
                 .pio_mask       = ATA_PIO4, \
                 .mwdma_mask     = ATA_MWDMA2, \
@@ -362,8 +359,8 @@ static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "PDC20246",
                 .init_chipset   = init_chipset_pdc202xx,
-                .init_hwif      = init_hwif_pdc202xx,
                 .port_ops       = &pdc20246_port_ops,
+                .dma_ops        = &pdc20246_dma_ops,
                 .host_flags     = IDE_HFLAGS_PDC202XX,
                 .pio_mask       = ATA_PIO4,
                 .mwdma_mask     = ATA_MWDMA2,