1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 75e95bdbe02f..30c4276ec882 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -520,14 +520,14 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info_early = {
                 .sht = &ali_sht,
-                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
+                .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .port_ops = &ali_early_port_ops
         };
         /* Revision 0x20 added DMA */
         static const struct ata_port_info info_20 = {
                 .sht = &ali_sht,
-                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
+                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
                 .port_ops = &ali_20_port_ops
@@ -535,7 +535,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         /* Revision 0x20 with support logic added UDMA */
         static const struct ata_port_info info_20_udma = {
                 .sht = &ali_sht,
-                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
+                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
                 .udma_mask = 0x07,      /* UDMA33 */
@@ -544,37 +544,37 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         /* Revision 0xC2 adds UDMA66 */
         static const struct ata_port_info info_c2 = {
                 .sht = &ali_sht,
-                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
+                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
-                .udma_mask = 0x1f,
+                .udma_mask = ATA_UDMA4,
                 .port_ops = &ali_c2_port_ops
         };
         /* Revision 0xC3 is UDMA66 for now */
         static const struct ata_port_info info_c3 = {
                 .sht = &ali_sht,
-                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
+                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
-                .udma_mask = 0x1f,
+                .udma_mask = ATA_UDMA4,
                 .port_ops = &ali_c2_port_ops
         };
         /* Revision 0xC4 is UDMA100 */
         static const struct ata_port_info info_c4 = {
                 .sht = &ali_sht,
-                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
+                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
-                .udma_mask = 0x3f,
+                .udma_mask = ATA_UDMA5,
                 .port_ops = &ali_c2_port_ops
         };
         /* Revision 0xC5 is UDMA133 with LBA48 DMA */
         static const struct ata_port_info info_c5 = {
                 .sht = &ali_sht,
-                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
+                .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
-                .udma_mask = 0x7f,
+                .udma_mask = ATA_UDMA6,
                 .port_ops = &ali_c5_port_ops
         };