71 files changed, 339 insertions, 331 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 699789bc9ea6..ec2922ad2dc0 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -404,7 +404,7 @@ static const struct ata_port_info ahci_port_info[] = {
         /* board_ahci */
         {
                 .flags          = AHCI_FLAG_COMMON,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &ahci_ops,
         },
@@ -412,7 +412,7 @@ static const struct ata_port_info ahci_port_info[] = {
         {
                 AHCI_HFLAGS     (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP),
                 .flags          = AHCI_FLAG_COMMON,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &ahci_vt8251_ops,
         },
@@ -420,7 +420,7 @@ static const struct ata_port_info ahci_port_info[] = {
         {
                 AHCI_HFLAGS     (AHCI_HFLAG_IGN_IRQ_IF_ERR),
                 .flags          = AHCI_FLAG_COMMON,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &ahci_ops,
         },
@@ -430,7 +430,7 @@ static const struct ata_port_info ahci_port_info[] = {
                                  AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
                                  AHCI_HFLAG_SECT255),
                 .flags          = AHCI_FLAG_COMMON,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &ahci_sb600_ops,
         },
@@ -440,7 +440,7 @@ static const struct ata_port_info ahci_port_info[] = {
                                  AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP),
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &ahci_ops,
         },
@@ -448,7 +448,7 @@ static const struct ata_port_info ahci_port_info[] = {
         {
                 AHCI_HFLAGS     (AHCI_HFLAG_IGN_SERR_INTERNAL),
                 .flags          = AHCI_FLAG_COMMON,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &ahci_sb600_ops,
         },
@@ -456,7 +456,7 @@ static const struct ata_port_info ahci_port_info[] = {
         {
                 AHCI_HFLAGS     (AHCI_HFLAG_YES_NCQ),
                 .flags          = AHCI_FLAG_COMMON,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &ahci_ops,
         },
@@ -464,7 +464,7 @@ static const struct ata_port_info ahci_port_info[] = {
         {
                 AHCI_HFLAGS     (AHCI_HFLAG_NO_PMP),
                 .flags          = AHCI_FLAG_COMMON,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &ahci_ops,
         },
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index dc48a6398abe..ecfd22b4f1ce 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -118,8 +118,8 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
         u16 command;
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &generic_port_ops
         };
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index ef8b30d577bd..e5cbe80ce172 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -446,34 +446,34 @@ static struct ata_port_info piix_port_info[] = {
         [piix_pata_mwdma] =     /* PIIX3 MWDMA only */
         {
                 .flags          = PIIX_PATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA12_ONLY, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
                 .port_ops       = &piix_pata_ops,
         },
 
         [piix_pata_33] =        /* PIIX4 at 33MHz */
         {
                 .flags          = PIIX_PATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
-                .udma_mask      = ATA_UDMA_MASK_40C,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA12_ONLY, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
+                .udma_mask      = ATA_UDMA2,
                 .port_ops       = &piix_pata_ops,
         },
 
         [ich_pata_33] =         /* ICH0 - ICH at 33Mhz*/
         {
                 .flags          = PIIX_PATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio 0-4 */
-                .mwdma_mask     = 0x06, /* Check: maybe 0x07  */
-                .udma_mask      = ATA_UDMA2, /* UDMA33 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA12_ONLY, /* Check: maybe MWDMA0 is ok  */
+                .udma_mask      = ATA_UDMA2,
                 .port_ops       = &ich_pata_ops,
         },
 
         [ich_pata_66] =         /* ICH controllers up to 66MHz */
         {
                 .flags          = PIIX_PATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio 0-4 */
-                .mwdma_mask     = 0x06, /* MWDMA0 is broken on chip */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA12_ONLY, /* MWDMA0 is broken on chip */
                 .udma_mask      = ATA_UDMA4,
                 .port_ops       = &ich_pata_ops,
         },
@@ -481,17 +481,17 @@ static struct ata_port_info piix_port_info[] = {
         [ich_pata_100] =
         {
                 .flags          = PIIX_PATA_FLAGS | PIIX_FLAG_CHECKINTR,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x06, /* mwdma1-2 */
-                .udma_mask      = ATA_UDMA5, /* udma0-5 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA12_ONLY,
+                .udma_mask      = ATA_UDMA5,
                 .port_ops       = &ich_pata_ops,
         },
 
         [ich5_sata] =
         {
                 .flags          = PIIX_SATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
@@ -499,8 +499,8 @@ static struct ata_port_info piix_port_info[] = {
         [ich6_sata] =
         {
                 .flags          = PIIX_SATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
@@ -508,8 +508,8 @@ static struct ata_port_info piix_port_info[] = {
         [ich6m_sata] =
         {
                 .flags          = PIIX_SATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
@@ -517,8 +517,8 @@ static struct ata_port_info piix_port_info[] = {
         [ich8_sata] =
         {
                 .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
@@ -526,8 +526,8 @@ static struct ata_port_info piix_port_info[] = {
         [ich8_2port_sata] =
         {
                 .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
@@ -535,8 +535,8 @@ static struct ata_port_info piix_port_info[] = {
         [tolapai_sata] =
         {
                 .flags          = PIIX_SATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
@@ -544,8 +544,8 @@ static struct ata_port_info piix_port_info[] = {
         [ich8m_apple_sata] =
         {
                 .flags          = PIIX_SATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
@@ -553,9 +553,9 @@ static struct ata_port_info piix_port_info[] = {
         [piix_pata_vmw] =
         {
                 .flags          = PIIX_PATA_FLAGS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
-                .udma_mask      = ATA_UDMA_MASK_40C,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA12_ONLY, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
+                .udma_mask      = ATA_UDMA2,
                 .port_ops       = &piix_vmw_ops,
         },
 
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index 8b77a9802df1..d8f35fe44421 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -246,9 +246,9 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
         static const struct ata_port_info info = {
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
 
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
-                .udma_mask      = 0x7f,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA6,
 
                 .port_ops       = &pacpi_ops,
         };
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index eb99dbe78081..751b7ea4816c 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -492,53 +492,53 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info_early = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
+                .pio_mask = ATA_PIO4,
                 .port_ops = &ali_early_port_ops
         };
         /* Revision 0x20 added DMA */
         static const struct ata_port_info info_20 = {
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .port_ops = &ali_20_port_ops
         };
         /* Revision 0x20 with support logic added UDMA */
         static const struct ata_port_info info_20_udma = {
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
-                .udma_mask = 0x07,      /* UDMA33 */
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
+                .udma_mask = ATA_UDMA2,
                 .port_ops = &ali_20_port_ops
         };
         /* Revision 0xC2 adds UDMA66 */
         static const struct ata_port_info info_c2 = {
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA4,
                 .port_ops = &ali_c2_port_ops
         };
         /* Revision 0xC3 is UDMA66 for now */
         static const struct ata_port_info info_c3 = {
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA4,
                 .port_ops = &ali_c2_port_ops
         };
         /* Revision 0xC4 is UDMA100 */
         static const struct ata_port_info info_c4 = {
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &ali_c4_port_ops
         };
         /* Revision 0xC5 is UDMA133 with LBA48 DMA */
         static const struct ata_port_info info_c5 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA6,
                 .port_ops = &ali_c5_port_ops
         };
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 115b1cd6dcf5..33a74f11171c 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -455,74 +455,74 @@ static void amd_clear_fifo(struct pci_dev *pdev)
 static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info[10] = {
-                {       /* 0: AMD 7401 */
+                {       /* 0: AMD 7401 - no swdma */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,     /* No SWDMA */
-                        .udma_mask = 0x07,      /* UDMA 33 */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA2,
                         .port_ops = &amd33_port_ops
                 },
                 {       /* 1: Early AMD7409 - no swdma */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA4, /* UDMA 66 */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA4,
                         .port_ops = &amd66_port_ops
                 },
-                {       /* 2: AMD 7409, no swdma errata */
+                {       /* 2: AMD 7409 */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA4, /* UDMA 66 */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA4,
                         .port_ops = &amd66_port_ops
                 },
                 {       /* 3: AMD 7411 */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA5, /* UDMA 100 */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA5,
                         .port_ops = &amd100_port_ops
                 },
                 {       /* 4: AMD 7441 */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA5, /* UDMA 100 */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA5,
                         .port_ops = &amd100_port_ops
                 },
-                {       /* 5: AMD 8111*/
+                {       /* 5: AMD 8111 - no swdma */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA6, /* UDMA 133, no swdma */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA6,
                         .port_ops = &amd133_port_ops
                 },
-                {       /* 6: AMD 8111 UDMA 100 (Serenade) */
+                {       /* 6: AMD 8111 UDMA 100 (Serenade) - no swdma */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA5, /* UDMA 100, no swdma */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA5,
                         .port_ops = &amd133_port_ops
                 },
                 {       /* 7: Nvidia Nforce */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA5, /* UDMA 100 */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA5,
                         .port_ops = &nv100_port_ops
                 },
-                {       /* 8: Nvidia Nforce2 and later */
+                {       /* 8: Nvidia Nforce2 and later - no swdma */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA6, /* UDMA 133, no swdma */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA6,
                         .port_ops = &nv133_port_ops
                 },
                 {       /* 9: AMD CS5536 (Geode companion) */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA5, /* UDMA 100 */
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA5,
                         .port_ops = &amd100_port_ops
                 }
         };
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 6b3092c75ffe..07c7fae6da13 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -323,29 +323,29 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
         static int printed_version;
         static const struct ata_port_info info_6210 = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA2,
                 .port_ops       = &artop6210_ops,
         };
         static const struct ata_port_info info_626x = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA4,
                 .port_ops       = &artop6260_ops,
         };
         static const struct ata_port_info info_628x = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
                 .port_ops       = &artop6260_ops,
         };
         static const struct ata_port_info info_628x_fast = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &artop6260_ops,
         };
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
index ab61095093b9..5c129f99a7e3 100644
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
@@ -67,7 +67,9 @@
  *
  * Alter PIO_MASK below according to table to set maximal PIO mode.
  */
-#define PIO_MASK (0x1f)
+enum {
+  PIO_MASK = ATA_PIO4,
+};
 
 /*
  * Struct containing private information about device.
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 506adde8ebb3..bec0b8ade66d 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -220,9 +220,9 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x06,     /* No MWDMA0 support */
-                .udma_mask = 0x3F,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA12_ONLY,
+                .udma_mask = ATA_UDMA5,
                 .port_ops = &atiixp_port_ops
         };
         static const struct pci_bits atiixp_enable_bits[] = {
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 1050fed96b2b..c4b47a3e5446 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1502,7 +1502,7 @@ static struct ata_port_info bfin_port_info[] = {
                 .flags          = ATA_FLAG_SLAVE_POSS
                                 | ATA_FLAG_MMIO
                                 | ATA_FLAG_NO_LEGACY,
-                .pio_mask       = 0x1f, /* pio0-4 */
+                .pio_mask       = ATA_PIO4,
                 .mwdma_mask     = 0,
                 .udma_mask      = 0,
                 .port_ops       = &bfin_pata_ops,
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 34a394264c3d..5acf9fa9b39f 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -211,7 +211,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
+                .pio_mask = ATA_PIO4,
                 .port_ops = &cmd640_port_ops
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 3167d8fed2f2..f98dffedf4bc 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -299,40 +299,40 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         static const struct ata_port_info cmd_info[6] = {
                 {       /* CMD 643 - no UDMA */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .port_ops = &cmd64x_port_ops
                 },
                 {       /* CMD 646 with broken UDMA */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .port_ops = &cmd64x_port_ops
                 },
                 {       /* CMD 646 with working UDMA */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .udma_mask = ATA_UDMA2,
                         .port_ops = &cmd64x_port_ops
                 },
                 {       /* CMD 646 rev 1  */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .port_ops = &cmd646r1_port_ops
                 },
                 {       /* CMD 648 */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .udma_mask = ATA_UDMA4,
                         .port_ops = &cmd648_port_ops
                 },
                 {       /* CMD 649 */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .udma_mask = ATA_UDMA5,
                         .port_ops = &cmd648_port_ops
                 }
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 1186bcd2781c..db6a96984f3f 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -158,7 +158,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
         static const unsigned int ctl_port[] = { 0x3F6, 0x376 };
         struct ata_port_info pi = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f,
+                .pio_mask       = ATA_PIO4,
                 .port_ops       = &cs5520_port_ops,
         };
         const struct ata_port_info *ppi[2];
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index bba453381f44..c974b05e4129 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -298,15 +298,15 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
-                .udma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
+                .udma_mask = ATA_UDMA2,
                 .port_ops = &cs5530_port_ops
         };
         /* The docking connector doesn't do UDMA, and it seems not MWDMA */
         static const struct ata_port_info info_palmax_secondary = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
+                .pio_mask = ATA_PIO4,
                 .port_ops = &cs5530_port_ops
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 8b236af84c2e..d33aa28239a9 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -181,8 +181,8 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA4,
                 .port_ops = &cs5535_port_ops
         };
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index afed92976198..6da4cb486c8d 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -241,8 +241,8 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &cs5536_port_ops,
         };
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index d546425cd380..8fb040bf7361 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -124,8 +124,8 @@ static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *i
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .port_ops = &cy82c693_port_ops
         };
         const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index ac6392ea35b0..bd498cc3920e 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -251,9 +251,9 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         static int printed_version;
         static const struct ata_port_info info = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma1-2 */
-                .udma_mask      = 0x0f, /* UDMA 66 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2, /* mwdma1-2 */
+                .udma_mask      = ATA_UDMA3, /* UDMA 66 */
                 .port_ops       = &efar_ops,
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 65c28e5a6cd7..d7f2da127d13 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -336,8 +336,8 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info_hpt366 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA4,
                 .port_ops = &hpt366_port_ops
         };
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 42163998de9a..81ab57003aba 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -753,55 +753,55 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         /* HPT370 - UDMA100 */
         static const struct ata_port_info info_hpt370 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &hpt370_port_ops
         };
         /* HPT370A - UDMA100 */
         static const struct ata_port_info info_hpt370a = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &hpt370a_port_ops
         };
         /* HPT370 - UDMA100 */
         static const struct ata_port_info info_hpt370_33 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &hpt370_port_ops
         };
         /* HPT370A - UDMA100 */
         static const struct ata_port_info info_hpt370a_33 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &hpt370a_port_ops
         };
         /* HPT371, 372 and friends - UDMA133 */
         static const struct ata_port_info info_hpt372 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA6,
                 .port_ops = &hpt372_port_ops
         };
         /* HPT374 - UDMA100, function 1 uses different prereset method */
         static const struct ata_port_info info_hpt374_fn0 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &hpt372_port_ops
         };
         static const struct ata_port_info info_hpt374_fn1 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &hpt374_fn1_port_ops
         };
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index d5c9fd7b82bb..3d59fe0a408d 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -441,8 +441,8 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         /* HPT372N and friends - UDMA133 */
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA6,
                 .port_ops = &hpt3x2n_port_ops
         };
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index f19cc645881a..7e310253b36b 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -188,11 +188,11 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         static int printed_version;
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
+                .pio_mask = ATA_PIO4,
 #if defined(CONFIG_PATA_HPT3X3_DMA)
                 /* Further debug needed */
-                .mwdma_mask = 0x07,
-                .udma_mask = 0x07,
+                .mwdma_mask = ATA_MWDMA2,
+                .udma_mask = ATA_UDMA2,
 #endif
                 .port_ops = &hpt3x3_port_ops
         };
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index cf9e9848f8b5..e7347db5b6c4 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -297,7 +297,7 @@ static int icside_dma_init(struct pata_icside_info *info)
 
         if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {
                 state->dma = ec->dma;
-                info->mwdma_mask = 0x07;        /* MW0..2 */
+                info->mwdma_mask = ATA_MWDMA2;
         }
 
         return 0;
@@ -473,7 +473,7 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info)
         for (i = 0; i < info->nr_ports; i++) {
                 struct ata_port *ap = host->ports[i];
 
-                ap->pio_mask = 0x1f;
+                ap->pio_mask = ATA_PIO4;
                 ap->mwdma_mask = info->mwdma_mask;
                 ap->flags |= ATA_FLAG_SLAVE_POSS;
                 ap->ops = &pata_icside_port_ops;
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 15cdb9148aab..afa8f704271e 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -66,7 +66,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
         ap = host->ports[0];
 
         ap->ops = &isapnp_port_ops;
-        ap->pio_mask = 1;
+        ap->pio_mask = ATA_PIO0;
         ap->flags |= ATA_FLAG_SLAVE_POSS;
 
         ap->ioaddr.cmd_addr = cmd_addr;
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
index c113d7c079c8..f156da8076f7 100644
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -262,8 +262,8 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *en
         static int printed_version;
         static const struct ata_port_info info = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA4, /* FIXME: want UDMA 100? */
                 .port_ops       = &it8213_ops,
         };
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index b05b86a912c5..188bc2fcd22c 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -875,29 +875,29 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         static const struct ata_port_info info_smart = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA6,
                 .port_ops = &it821x_smart_port_ops
         };
         static const struct ata_port_info info_passthru = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA6,
                 .port_ops = &it821x_passthru_port_ops
         };
         static const struct ata_port_info info_rdc = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA6,
                 .port_ops = &it821x_rdc_port_ops
         };
         static const struct ata_port_info info_rdc_11 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 /* No UDMA */
                 .port_ops = &it821x_rdc_port_ops
         };
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index b173c157ab00..19fdecf319a6 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -176,7 +176,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
         ap = host->ports[0];
 
         ap->ops = &ixp4xx_port_ops;
-        ap->pio_mask = 0x1f; /* PIO4 */
+        ap->pio_mask = ATA_PIO4;
         ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI;
 
         ixp4xx_setup_port(ap, data, cs0->start, cs1->start);
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 38cf1ab2d289..3a1474ac8838 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -136,8 +136,8 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i
         static const struct ata_port_info info = {
                 .flags  = ATA_FLAG_SLAVE_POSS,
 
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
 
                 .port_ops       = &jmicron_ops,
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index e3bc1b436284..3f830f0fe2cc 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -129,7 +129,7 @@ static int qdi;			/* Set to probe QDI controllers */
 static int winbond;             /* Set to probe Winbond controllers,
                                         give I/O port if non standard */
 static int autospeed;           /* Chip present which snoops speed changes */
-static int pio_mask = 0x1F;     /* PIO range for autospeed devices */
+static int pio_mask = ATA_PIO4; /* PIO range for autospeed devices */
 static int iordy_mask = 0xFFFFFFFF;     /* Use iordy if available */
 
 /**
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 76e399bf8c1b..2096fb737f82 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -126,8 +126,8 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
         static const struct ata_port_info info = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
 
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
 
                 .port_ops       = &marvell_ops,
@@ -136,8 +136,8 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
                 /* Slave possible as its magically mapped not real */
                 .flags          = ATA_FLAG_SLAVE_POSS,
 
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
 
                 .port_ops       = &marvell_ops,
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 50ae6d13078a..68d27bc70d06 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -737,10 +737,10 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
          */
         prop = of_get_property(op->node, "mwdma-mode", &proplen);
         if ((prop) && (proplen >= 4))
-                mwdma_mask = 0x7 & ((1 << (*prop + 1)) - 1);
+                mwdma_mask = ATA_MWDMA2 & ((1 << (*prop + 1)) - 1);
         prop = of_get_property(op->node, "udma-mode", &proplen);
         if ((prop) && (proplen >= 4))
-                udma_mask = 0x7 & ((1 << (*prop + 1)) - 1);
+                udma_mask = ATA_UDMA2 & ((1 << (*prop + 1)) - 1);
 
         ata_irq = irq_of_parse_and_map(op->node, 0);
         if (ata_irq == NO_IRQ) {
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index aa576cac4d17..b21f0021f54a 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -200,7 +200,7 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
            the MPIIX your box goes castors up */
 
         ap->ops = &mpiix_port_ops;
-        ap->pio_mask = 0x1F;
+        ap->pio_mask = ATA_PIO4;
         ap->flags |= ATA_FLAG_SLAVE_POSS;
 
         ap->ioaddr.cmd_addr = cmd_addr;
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index 9dc05e1656a8..bdb236957cb9 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -51,8 +51,8 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e
                 .flags          = ATA_FLAG_SLAVE_POSS,
                 /* Actually we don't really care about these as the
                    firmware deals with it */
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5, /* UDMA 133 */
                 .port_ops       = &netcell_ops,
         };
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index 4dd9a3b031e4..0fb6b1b1e634 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -136,7 +136,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         if (!base)
                 return -ENOMEM;
         ap->ops = &ninja32_port_ops;
-        ap->pio_mask = 0x1F;
+        ap->pio_mask = ATA_PIO4;
         ap->flags |= ATA_FLAG_SLAVE_POSS;
 
         ap->ioaddr.cmd_addr = base + 0x10;
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 40d411c460de..ca53fac06717 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -144,7 +144,7 @@ static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x0F,
+                .pio_mask = ATA_PIO3,
                 .port_ops = &ns87410_port_ops
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index 89bf5f865d6a..773b1590b492 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -346,8 +346,8 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         static int printed_version;
         static const struct ata_port_info info = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .port_ops       = &ns87415_pata_ops,
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
@@ -355,8 +355,8 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *e
 #if defined(CONFIG_SUPERIO)
         static const struct ata_port_info info87560 = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .port_ops       = &ns87560_pata_ops,
         };
 
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index 0fe4ef309c62..efe2c1985af3 100644
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -871,7 +871,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)
         ap->private_data = cf_port;
         cf_port->ap = ap;
         ap->ops = &octeon_cf_ops;
-        ap->pio_mask = 0x7f; /* Support PIO 0-6 */
+        ap->pio_mask = ATA_PIO6;
         ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY
                   | ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING;
 
@@ -900,7 +900,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)
                 ap->ioaddr.ctl_addr     = cs1 + (6 << 1) + 1;
                 octeon_cf_ops.sff_data_xfer = octeon_cf_data_xfer16;
 
-                ap->mwdma_mask  = 0x1f; /* Support MWDMA 0-4 */
+                ap->mwdma_mask  = ATA_MWDMA4;
                 irq = platform_get_irq(pdev, 0);
                 irq_handler = octeon_cf_interrupt;
 
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 2c1a91c40c1a..84ac5033ac89 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -238,8 +238,8 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         static int printed_version;
         static const struct ata_port_info info = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma1-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .port_ops       = &oldpiix_pata_ops,
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index e4fa4d565e96..99eddda2d2e5 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -163,7 +163,7 @@ static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
+                .pio_mask = ATA_PIO4,
                 .port_ops = &opti_port_ops
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 93bb6e91973f..86885a445f97 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -399,15 +399,15 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info_82c700 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .port_ops = &optidma_port_ops
         };
         static const struct ata_port_info info_82c700_udma = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
-                .udma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
+                .udma_mask = ATA_UDMA2,
                 .port_ops = &optiplus_port_ops
         };
         const struct ata_port_info *ppi[] = { &info_82c700, NULL };
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 64b2e2281ee7..a5cbcc280b23 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -299,7 +299,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
                 ap = host->ports[p];
 
                 ap->ops = ops;
-                ap->pio_mask = 1;               /* ISA so PIO 0 cycles */
+                ap->pio_mask = ATA_PIO0;        /* ISA so PIO 0 cycles */
                 ap->flags |= ATA_FLAG_SLAVE_POSS;
                 ap->ioaddr.cmd_addr = io_addr + 0x10 * p;
                 ap->ioaddr.altstatus_addr = ctl_addr + 0x10 * p;
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index e94efccaa482..ca5cad0fd80b 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -152,18 +152,18 @@ static struct ata_port_info pdc2027x_port_info[] = {
         {
                 .flags          = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS |
                                   ATA_FLAG_MMIO,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
-                .udma_mask      = ATA_UDMA5, /* udma0-5 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
                 .port_ops       = &pdc2027x_pata100_ops,
         },
         /* PDC_UDMA_133 */
         {
                 .flags          = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS |
                                   ATA_FLAG_MMIO,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
-                .udma_mask      = ATA_UDMA6, /* udma0-6 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc2027x_pata133_ops,
         },
 };
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index 799a6a098712..5fedb3d4032b 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -291,22 +291,22 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id
         static const struct ata_port_info info[3] = {
                 {
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .udma_mask = ATA_UDMA2,
                         .port_ops = &pdc2024x_port_ops
                 },
                 {
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .udma_mask = ATA_UDMA4,
                         .port_ops = &pdc2026x_port_ops
                 },
                 {
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .udma_mask = ATA_UDMA5,
                         .port_ops = &pdc2026x_port_ops
                 }
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index f1b26f7c8e4d..45879dc6fa41 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -212,11 +212,11 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i
 
         if (type == 6580) {
                 ap->ops = &qdi6580_port_ops;
-                ap->pio_mask = 0x1F;
+                ap->pio_mask = ATA_PIO4;
                 ap->flags |= ATA_FLAG_SLAVE_POSS;
         } else {
                 ap->ops = &qdi6500_port_ops;
-                ap->pio_mask = 0x07;    /* Actually PIO3 !IORDY is possible */
+                ap->pio_mask = ATA_PIO2; /* Actually PIO3 !IORDY is possible */
                 ap->flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_IORDY;
         }
 
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 695d44ae52c6..1956d5c03a7f 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -216,9 +216,9 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         static int printed_version;
         static const struct ata_port_info info = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma1-2 */
-                .udma_mask      = 0x14, /* UDMA33/66 only */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2, /* mwdma1-2 */
+                .udma_mask      = ATA_UDMA24_ONLY,
                 .port_ops       = &radisys_pata_ops,
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index fbfee1bd85ff..2f3b49cc4970 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -89,7 +89,7 @@ static void rb532_pata_setup_ports(struct ata_host *ah)
         ap = ah->ports[0];
 
         ap->ops         = &rb532_pata_port_ops;
-        ap->pio_mask    = 0x1f; /* PIO4 */
+        ap->pio_mask    = ATA_PIO4;
         ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
 
         ap->ioaddr.cmd_addr     = info->iobase + RB500_CF_REG_BASE;
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 46d6bc1bf1e9..0c574c065c62 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -88,7 +88,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en
         static int printed_version;
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
+                .pio_mask = ATA_PIO4,
                 .port_ops = &rz1000_port_ops
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 9a4bdca54616..36a0c3593297 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -205,9 +205,9 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
-                .udma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
+                .udma_mask = ATA_UDMA2,
                 .port_ops = &sc1200_port_ops
         };
         /* Can't enable port 2 yet, see top comments */
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index d447f1cb46ec..4257d6b40af4 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -1001,8 +1001,8 @@ static struct ata_port_operations scc_pata_ops = {
 static struct ata_port_info scc_port_info[] = {
         {
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x00,
+                .pio_mask       = ATA_PIO4,
+                /* No MWDMA */
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &scc_pata_ops,
         },
diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
index 6aeeeeb34124..99cceb458e2a 100644
--- a/drivers/ata/pata_sch.c
+++ b/drivers/ata/pata_sch.c
@@ -84,9 +84,9 @@ static struct ata_port_operations sch_pata_ops = {
 
 static struct ata_port_info sch_port_info = {
         .flags          = ATA_FLAG_SLAVE_POSS,
-        .pio_mask       = ATA_PIO4,   /* pio0-4 */
-        .mwdma_mask     = ATA_MWDMA2, /* mwdma0-2 */
-        .udma_mask      = ATA_UDMA5,  /* udma0-5 */
+        .pio_mask       = ATA_PIO4,
+        .mwdma_mask     = ATA_MWDMA2,
+        .udma_mask      = ATA_UDMA5,
         .port_ops       = &sch_pata_ops,
 };
 
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 8d2fd9dd40c7..beaed12d50e4 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -398,26 +398,26 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
         static const struct ata_port_info info[4] = {
                 { /* OSB4 */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        .udma_mask = ATA_UDMA2,
                         .port_ops = &serverworks_osb4_port_ops
                 }, { /* OSB4 no UDMA */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
-                        .udma_mask = 0x00,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
+                        /* No UDMA */
                         .port_ops = &serverworks_osb4_port_ops
                 }, { /* CSB5 */
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .udma_mask = ATA_UDMA4,
                         .port_ops = &serverworks_csb_port_ops
                 }, { /* CSB5 - later revisions*/
                         .flags = ATA_FLAG_SLAVE_POSS,
-                        .pio_mask = 0x1f,
-                        .mwdma_mask = 0x07,
+                        .pio_mask = ATA_PIO4,
+                        .mwdma_mask = ATA_MWDMA2,
                         .udma_mask = ATA_UDMA5,
                         .port_ops = &serverworks_csb_port_ops
                 }
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 9e764e5747e6..4cb649d8d38c 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -282,15 +282,15 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA6,
                 .port_ops = &sil680_port_ops
         };
         static const struct ata_port_info info_slow = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &sil680_port_ops
         };
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 27ceb42a774b..488e77bcd22b 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -552,51 +552,57 @@ static struct ata_port_operations sis_old_ops = {
 
 static const struct ata_port_info sis_info = {
         .flags          = ATA_FLAG_SLAVE_POSS,
-        .pio_mask       = 0x1f, /* pio0-4 */
-        .mwdma_mask     = 0x07,
-        .udma_mask      = 0,
+        .pio_mask       = ATA_PIO4,
+        .mwdma_mask     = ATA_MWDMA2,
+        /* No UDMA */
         .port_ops       = &sis_old_ops,
 };
 static const struct ata_port_info sis_info33 = {
         .flags          = ATA_FLAG_SLAVE_POSS,
-        .pio_mask       = 0x1f, /* pio0-4 */
-        .mwdma_mask     = 0x07,
-        .udma_mask      = ATA_UDMA2,    /* UDMA 33 */
+        .pio_mask       = ATA_PIO4,
+        .mwdma_mask     = ATA_MWDMA2,
+        .udma_mask      = ATA_UDMA2,
         .port_ops       = &sis_old_ops,
 };
 static const struct ata_port_info sis_info66 = {
         .flags          = ATA_FLAG_SLAVE_POSS,
-        .pio_mask       = 0x1f, /* pio0-4 */
-        .udma_mask      = ATA_UDMA4,    /* UDMA 66 */
+        .pio_mask       = ATA_PIO4,
+        /* No MWDMA */
+        .udma_mask      = ATA_UDMA4,
         .port_ops       = &sis_66_ops,
 };
 static const struct ata_port_info sis_info100 = {
         .flags          = ATA_FLAG_SLAVE_POSS,
-        .pio_mask       = 0x1f, /* pio0-4 */
+        .pio_mask       = ATA_PIO4,
+        /* No MWDMA */
         .udma_mask      = ATA_UDMA5,
         .port_ops       = &sis_100_ops,
 };
 static const struct ata_port_info sis_info100_early = {
         .flags          = ATA_FLAG_SLAVE_POSS,
+        .pio_mask       = ATA_PIO4,
+        /* No MWDMA */
         .udma_mask      = ATA_UDMA5,
-        .pio_mask       = 0x1f, /* pio0-4 */
         .port_ops       = &sis_66_ops,
 };
 static const struct ata_port_info sis_info133 = {
         .flags          = ATA_FLAG_SLAVE_POSS,
-        .pio_mask       = 0x1f, /* pio0-4 */
+        .pio_mask       = ATA_PIO4,
+        /* No MWDMA */
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &sis_133_ops,
 };
 const struct ata_port_info sis_info133_for_sata = {
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
-        .pio_mask       = 0x1f, /* pio0-4 */
+        .pio_mask       = ATA_PIO4,
+        /* No MWDMA */
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &sis_133_for_sata_ops,
 };
 static const struct ata_port_info sis_info133_early = {
         .flags          = ATA_FLAG_SLAVE_POSS,
-        .pio_mask       = 0x1f, /* pio0-4 */
+        .pio_mask       = ATA_PIO4,
+        /* No MWDMA */
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &sis_133_early_ops,
 };
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 1b0e7b6d8ef5..29f733c32066 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -283,13 +283,13 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id
 {
         static const struct ata_port_info info_dma = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .port_ops = &sl82c105_port_ops
         };
         static const struct ata_port_info info_early = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
+                .pio_mask = ATA_PIO4,
                 .port_ops = &sl82c105_port_ops
         };
         /* for now use only the first port */
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index ef9597517cdd..f1f13ff222fd 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -191,8 +191,8 @@ static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .port_ops = &triflex_port_ops
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index ba556d3e6963..b08e6e0f82b6 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -422,46 +422,46 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         /* Early VIA without UDMA support */
         static const struct ata_port_info via_mwdma_info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .port_ops = &via_port_ops
         };
         /* Ditto with IRQ masking required */
         static const struct ata_port_info via_mwdma_info_borked = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .port_ops = &via_port_ops_noirq,
         };
         /* VIA UDMA 33 devices (and borked 66) */
         static const struct ata_port_info via_udma33_info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA2,
                 .port_ops = &via_port_ops
         };
         /* VIA UDMA 66 devices */
         static const struct ata_port_info via_udma66_info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA4,
                 .port_ops = &via_port_ops
         };
         /* VIA UDMA 100 devices */
         static const struct ata_port_info via_udma100_info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA5,
                 .port_ops = &via_port_ops
         };
         /* UDMA133 with bad AST (All current 133) */
         static const struct ata_port_info via_udma133_info = {
                 .flags = ATA_FLAG_SLAVE_POSS,
-                .pio_mask = 0x1f,
-                .mwdma_mask = 0x07,
+                .pio_mask = ATA_PIO4,
+                .mwdma_mask = ATA_MWDMA2,
                 .udma_mask = ATA_UDMA6, /* FIXME: should check north bridge */
                 .port_ops = &via_port_ops
         };
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index 319e164a3d74..6d8619b6f670 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -193,7 +193,7 @@ static __init int winbond_init_one(unsigned long port)
                 ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", cmd_port, ctl_port);
 
                 ap->ops = &winbond_port_ops;
-                ap->pio_mask = 0x1F;
+                ap->pio_mask = ATA_PIO4;
                 ap->flags |= ATA_FLAG_SLAVE_POSS;
                 ap->ioaddr.cmd_addr = cmd_addr;
                 ap->ioaddr.altstatus_addr = ctl_addr;
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index be53545c9f64..c509c206a459 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -166,7 +166,7 @@ static struct ata_port_info adma_port_info[] = {
                 .flags          = ATA_FLAG_SLAVE_POSS |
                                   ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
                                   ATA_FLAG_PIO_POLLING,
-                .pio_mask       = 0x10, /* pio4 */
+                .pio_mask       = ATA_PIO4_ONLY,
                 .udma_mask      = ATA_UDMA4,
                 .port_ops       = &adma_ata_ops,
         },
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 55bc88c1707b..c2e90e1fece0 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1279,8 +1279,8 @@ static struct ata_port_operations sata_fsl_ops = {
 static const struct ata_port_info sata_fsl_port_info[] = {
         {
          .flags = SATA_FSL_HOST_FLAGS,
-         .pio_mask = 0x1f,      /* pio 0-4 */
-         .udma_mask = 0x7f,     /* udma 0-6 */
+         .pio_mask = ATA_PIO4,
+         .udma_mask = ATA_UDMA6,
          .port_ops = &sata_fsl_ops,
          },
 };
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index fbbd87c96f10..305a4f825f53 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -744,8 +744,8 @@ static struct ata_port_operations inic_port_ops = {
 
 static struct ata_port_info inic_port_info = {
         .flags                  = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA,
-        .pio_mask               = 0x1f, /* pio0-4 */
-        .mwdma_mask             = 0x07, /* mwdma0-2 */
+        .pio_mask               = ATA_PIO4,
+        .mwdma_mask             = ATA_MWDMA2,
         .udma_mask              = ATA_UDMA6,
         .port_ops               = &inic_port_ops
 };
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index f65b53785a8f..2f523f8c27f6 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -57,9 +57,9 @@ enum {
         NV_MMIO_BAR                     = 5,
 
         NV_PORTS                        = 2,
-        NV_PIO_MASK                     = 0x1f,
-        NV_MWDMA_MASK                   = 0x07,
-        NV_UDMA_MASK                    = 0x7f,
+        NV_PIO_MASK                     = ATA_PIO4,
+        NV_MWDMA_MASK                   = ATA_MWDMA2,
+        NV_UDMA_MASK                    = ATA_UDMA6,
         NV_PORT0_SCR_REG_OFFSET         = 0x00,
         NV_PORT1_SCR_REG_OFFSET         = 0x40,
 
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index ba9a2570a742..3ad2b8863636 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -213,8 +213,8 @@ static const struct ata_port_info pdc_port_info[] = {
         {
                 .flags          = PDC_COMMON_FLAGS | ATA_FLAG_SATA |
                                   PDC_FLAG_SATA_PATA,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc_old_sata_ops,
         },
@@ -222,8 +222,8 @@ static const struct ata_port_info pdc_port_info[] = {
         [board_2037x_pata] =
         {
                 .flags          = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc_pata_ops,
         },
@@ -232,8 +232,8 @@ static const struct ata_port_info pdc_port_info[] = {
         {
                 .flags          = PDC_COMMON_FLAGS | ATA_FLAG_SATA |
                                   PDC_FLAG_4_PORTS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc_old_sata_ops,
         },
@@ -242,8 +242,8 @@ static const struct ata_port_info pdc_port_info[] = {
         {
                 .flags          = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS |
                                   PDC_FLAG_4_PORTS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc_pata_ops,
         },
@@ -252,8 +252,8 @@ static const struct ata_port_info pdc_port_info[] = {
         {
                 .flags          = PDC_COMMON_FLAGS | ATA_FLAG_SATA |
                                   PDC_FLAG_GEN_II | PDC_FLAG_SATA_PATA,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc_sata_ops,
         },
@@ -262,8 +262,8 @@ static const struct ata_port_info pdc_port_info[] = {
         {
                 .flags          = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS |
                                   PDC_FLAG_GEN_II,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc_pata_ops,
         },
@@ -272,8 +272,8 @@ static const struct ata_port_info pdc_port_info[] = {
         {
                 .flags          = PDC_COMMON_FLAGS | ATA_FLAG_SATA |
                                   PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc_sata_ops,
         },
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index a000c86ac859..7112d89fd9ff 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -160,7 +160,7 @@ static const struct ata_port_info qs_port_info[] = {
         {
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING,
-                .pio_mask       = 0x10, /* pio4 */
+                .pio_mask       = ATA_PIO4_ONLY,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &qs_ata_ops,
         },
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index d0091609e210..e67ce8e5caa5 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -200,8 +200,8 @@ static const struct ata_port_info sil_port_info[] = {
         /* sil_3112 */
         {
                 .flags          = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE,
-                .pio_mask       = 0x1f,                 /* pio0-4 */
-                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
                 .port_ops       = &sil_ops,
         },
@@ -209,24 +209,24 @@ static const struct ata_port_info sil_port_info[] = {
         {
                 .flags          = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE |
                                   SIL_FLAG_NO_SATA_IRQ,
-                .pio_mask       = 0x1f,                 /* pio0-4 */
-                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
                 .port_ops       = &sil_ops,
         },
         /* sil_3512 */
         {
                 .flags          = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT,
-                .pio_mask       = 0x1f,                 /* pio0-4 */
-                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
                 .port_ops       = &sil_ops,
         },
         /* sil_3114 */
         {
                 .flags          = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT,
-                .pio_mask       = 0x1f,                 /* pio0-4 */
-                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
                 .port_ops       = &sil_ops,
         },
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 2590c2279fa7..0d8990dcdfcd 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -429,25 +429,25 @@ static const struct ata_port_info sil24_port_info[] = {
         {
                 .flags          = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(4) |
                                   SIL24_FLAG_PCIX_IRQ_WOC,
-                .pio_mask       = 0x1f,                 /* pio0-4 */
-                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
-                .udma_mask      = ATA_UDMA5,            /* udma0-5 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
                 .port_ops       = &sil24_ops,
         },
         /* sil_3132 */
         {
                 .flags          = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2),
-                .pio_mask       = 0x1f,                 /* pio0-4 */
-                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
-                .udma_mask      = ATA_UDMA5,            /* udma0-5 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
                 .port_ops       = &sil24_ops,
         },
         /* sil_3131/sil_3531 */
         {
                 .flags          = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1),
-                .pio_mask       = 0x1f,                 /* pio0-4 */
-                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
-                .udma_mask      = ATA_UDMA5,            /* udma0-5 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
                 .port_ops       = &sil24_ops,
         },
 };
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 9c43b4e7c4a6..8f9833228619 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -97,8 +97,8 @@ static struct ata_port_operations sis_ops = {
 
 static const struct ata_port_info sis_port_info = {
         .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
-        .pio_mask       = 0x1f,
-        .mwdma_mask     = 0x7,
+        .pio_mask       = ATA_PIO4,
+        .mwdma_mask     = ATA_MWDMA2,
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &sis_ops,
 };
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 609d147813ae..7257f2d5c52c 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -361,8 +361,8 @@ static const struct ata_port_info k2_port_info[] = {
         {
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA,
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &k2_sata_ops,
         },
@@ -371,8 +371,8 @@ static const struct ata_port_info k2_port_info[] = {
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA |
                                   K2_FLAG_SATA_8_PORTS,
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &k2_sata_ops,
         },
@@ -380,8 +380,8 @@ static const struct ata_port_info k2_port_info[] = {
         {
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO | K2_FLAG_BAR_POS_3,
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &k2_sata_ops,
         },
@@ -389,8 +389,8 @@ static const struct ata_port_info k2_port_info[] = {
         {
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO,
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &k2_sata_ops,
         },
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index ec04b8d3c791..dce3dccced3f 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -265,8 +265,8 @@ static const struct ata_port_info pdc_port_info[] = {
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_SRST | ATA_FLAG_MMIO |
                                   ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &pdc_20621_ops,
         },
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 019575bb3e08..e5bff47e8aa1 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -89,7 +89,7 @@ static struct ata_port_operations uli_ops = {
 static const struct ata_port_info uli_port_info = {
         .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                           ATA_FLAG_IGN_SIMPLEX,
-        .pio_mask       = 0x1f,         /* pio0-4 */
+        .pio_mask       = ATA_PIO4,
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &uli_ops,
 };
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 5c62da9cd491..98e8c50703b3 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -146,24 +146,24 @@ static struct ata_port_operations vt8251_ops = {
 
 static const struct ata_port_info vt6420_port_info = {
         .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
-        .pio_mask       = 0x1f,
-        .mwdma_mask     = 0x07,
+        .pio_mask       = ATA_PIO4,
+        .mwdma_mask     = ATA_MWDMA2,
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &vt6420_sata_ops,
 };
 
 static struct ata_port_info vt6421_sport_info = {
         .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
-        .pio_mask       = 0x1f,
-        .mwdma_mask     = 0x07,
+        .pio_mask       = ATA_PIO4,
+        .mwdma_mask     = ATA_MWDMA2,
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &vt6421_sata_ops,
 };
 
 static struct ata_port_info vt6421_pport_info = {
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY,
-        .pio_mask       = 0x1f,
-        .mwdma_mask     = 0,
+        .pio_mask       = ATA_PIO4,
+        /* No MWDMA */
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &vt6421_pata_ops,
 };
@@ -171,8 +171,8 @@ static struct ata_port_info vt6421_pport_info = {
 static struct ata_port_info vt8251_port_info = {
         .flags          = ATA_FLAG_SATA | ATA_FLAG_SLAVE_POSS |
                           ATA_FLAG_NO_LEGACY,
-        .pio_mask       = 0x1f,
-        .mwdma_mask     = 0x07,
+        .pio_mask       = ATA_PIO4,
+        .mwdma_mask     = ATA_MWDMA2,
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &vt8251_ops,
 };
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index c57cdff9e6bd..ef211f333d7b 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -345,8 +345,8 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev,
         static const struct ata_port_info pi = {
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO,
-                .pio_mask       = 0x1f,
-                .mwdma_mask     = 0x07,
+                .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &vsc_sata_ops,
         };