1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 24efda25c034..a3443fce40f1 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -482,9 +482,6 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->ultra_mask = hwif->cds->udma_mask;
-        hwif->mwdma_mask = 0x07;
-
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 hwif->cbl = pdcnew_cable_detect(hwif);
 }
@@ -553,7 +550,8 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x3f, /* udma0-5 */
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         },{     /* 1 */
                 .name           = "PDC20269",
                 .init_setup     = init_setup_pdcnew,
@@ -561,7 +559,8 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x7f, /* udma0-6*/
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA6,
         },{     /* 2 */
                 .name           = "PDC20270",
                 .init_setup     = init_setup_pdc20270,
@@ -569,7 +568,8 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x3f, /* udma0-5 */
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         },{     /* 3 */
                 .name           = "PDC20271",
                 .init_setup     = init_setup_pdcnew,
@@ -577,7 +577,8 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x7f, /* udma0-6*/
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA6,
         },{     /* 4 */
                 .name           = "PDC20275",
                 .init_setup     = init_setup_pdcnew,
@@ -585,7 +586,8 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x7f, /* udma0-6*/
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA6,
         },{     /* 5 */
                 .name           = "PDC20276",
                 .init_setup     = init_setup_pdc20276,
@@ -593,7 +595,8 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x7f, /* udma0-6*/
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA6,
         },{     /* 6 */
                 .name           = "PDC20277",
                 .init_setup     = init_setup_pdcnew,
@@ -601,7 +604,8 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x7f, /* udma0-6*/
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA6,
         }
 };