diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-07-09 12:16:50 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-09 12:17:35 -0400 |
commit | bf6263a853c9c143bf03f0a6fdcc68ab714fb5f5 (patch) | |
tree | baf6189fc6e5c13934749488948e1cbfc6e65dea /drivers/ata | |
parent | cd70c26617f4686355263be4533ce8030242740e (diff) |
[libata] Use ATA_UDMAx standard masks when filling driver's udma_mask info
The ATA_UDMAx masks are self-documenting, and far better than manually
writing in the hex mask.
Note that pata_it8213 mask differed from the comment. Added a FIXME there.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/ata_generic.c | 2 | ||||
-rw-r--r-- | drivers/ata/ata_piix.c | 10 | ||||
-rw-r--r-- | drivers/ata/pata_ali.c | 8 | ||||
-rw-r--r-- | drivers/ata/pata_amd.c | 18 | ||||
-rw-r--r-- | drivers/ata/pata_cs5535.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_hpt366.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_hpt37x.c | 8 | ||||
-rw-r--r-- | drivers/ata/pata_hpt3x2n.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_it8213.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_it821x.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_jmicron.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_marvell.c | 4 | ||||
-rw-r--r-- | drivers/ata/pata_netcell.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_serverworks.c | 4 | ||||
-rw-r--r-- | drivers/ata/pata_sil680.c | 4 | ||||
-rw-r--r-- | drivers/ata/pata_via.c | 8 | ||||
-rw-r--r-- | drivers/ata/pdc_adma.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_inic162x.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_mv.c | 14 | ||||
-rw-r--r-- | drivers/ata/sata_qstor.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_sil.c | 8 | ||||
-rw-r--r-- | drivers/ata/sata_sil24.c | 6 | ||||
-rw-r--r-- | drivers/ata/sata_sis.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_svw.c | 4 | ||||
-rw-r--r-- | drivers/ata/sata_uli.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_via.c | 6 | ||||
-rw-r--r-- | drivers/ata/sata_vsc.c | 2 |
27 files changed, 65 insertions, 65 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 0878fb5b325..430fcf4f9ef 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c | |||
@@ -146,7 +146,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id | |||
146 | .flags = ATA_FLAG_SLAVE_POSS, | 146 | .flags = ATA_FLAG_SLAVE_POSS, |
147 | .pio_mask = 0x1f, | 147 | .pio_mask = 0x1f, |
148 | .mwdma_mask = 0x07, | 148 | .mwdma_mask = 0x07, |
149 | .udma_mask = 0x3f, | 149 | .udma_mask = ATA_UDMA5, |
150 | .port_ops = &generic_port_ops | 150 | .port_ops = &generic_port_ops |
151 | }; | 151 | }; |
152 | const struct ata_port_info *ppi[] = { &info, NULL }; | 152 | const struct ata_port_info *ppi[] = { &info, NULL }; |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 76cbdf0094f..6a3bfef58e1 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -497,7 +497,7 @@ static struct ata_port_info piix_port_info[] = { | |||
497 | .flags = PIIX_SATA_FLAGS, | 497 | .flags = PIIX_SATA_FLAGS, |
498 | .pio_mask = 0x1f, /* pio0-4 */ | 498 | .pio_mask = 0x1f, /* pio0-4 */ |
499 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 499 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
500 | .udma_mask = 0x7f, /* udma0-6 */ | 500 | .udma_mask = ATA_UDMA6, |
501 | .port_ops = &piix_sata_ops, | 501 | .port_ops = &piix_sata_ops, |
502 | }, | 502 | }, |
503 | 503 | ||
@@ -507,7 +507,7 @@ static struct ata_port_info piix_port_info[] = { | |||
507 | .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SCR, | 507 | .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SCR, |
508 | .pio_mask = 0x1f, /* pio0-4 */ | 508 | .pio_mask = 0x1f, /* pio0-4 */ |
509 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 509 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
510 | .udma_mask = 0x7f, /* udma0-6 */ | 510 | .udma_mask = ATA_UDMA6, |
511 | .port_ops = &piix_sata_ops, | 511 | .port_ops = &piix_sata_ops, |
512 | }, | 512 | }, |
513 | 513 | ||
@@ -518,7 +518,7 @@ static struct ata_port_info piix_port_info[] = { | |||
518 | PIIX_FLAG_AHCI, | 518 | PIIX_FLAG_AHCI, |
519 | .pio_mask = 0x1f, /* pio0-4 */ | 519 | .pio_mask = 0x1f, /* pio0-4 */ |
520 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 520 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
521 | .udma_mask = 0x7f, /* udma0-6 */ | 521 | .udma_mask = ATA_UDMA6, |
522 | .port_ops = &piix_sata_ops, | 522 | .port_ops = &piix_sata_ops, |
523 | }, | 523 | }, |
524 | 524 | ||
@@ -529,7 +529,7 @@ static struct ata_port_info piix_port_info[] = { | |||
529 | PIIX_FLAG_AHCI, | 529 | PIIX_FLAG_AHCI, |
530 | .pio_mask = 0x1f, /* pio0-4 */ | 530 | .pio_mask = 0x1f, /* pio0-4 */ |
531 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 531 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
532 | .udma_mask = 0x7f, /* udma0-6 */ | 532 | .udma_mask = ATA_UDMA6, |
533 | .port_ops = &piix_sata_ops, | 533 | .port_ops = &piix_sata_ops, |
534 | }, | 534 | }, |
535 | 535 | ||
@@ -540,7 +540,7 @@ static struct ata_port_info piix_port_info[] = { | |||
540 | PIIX_FLAG_AHCI, | 540 | PIIX_FLAG_AHCI, |
541 | .pio_mask = 0x1f, /* pio0-4 */ | 541 | .pio_mask = 0x1f, /* pio0-4 */ |
542 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 542 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
543 | .udma_mask = 0x7f, /* udma0-6 */ | 543 | .udma_mask = ATA_UDMA6, |
544 | .port_ops = &piix_sata_ops, | 544 | .port_ops = &piix_sata_ops, |
545 | }, | 545 | }, |
546 | 546 | ||
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index 5c53d5aa13a..30c4276ec88 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
@@ -547,7 +547,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
547 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, | 547 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, |
548 | .pio_mask = 0x1f, | 548 | .pio_mask = 0x1f, |
549 | .mwdma_mask = 0x07, | 549 | .mwdma_mask = 0x07, |
550 | .udma_mask = 0x1f, | 550 | .udma_mask = ATA_UDMA4, |
551 | .port_ops = &ali_c2_port_ops | 551 | .port_ops = &ali_c2_port_ops |
552 | }; | 552 | }; |
553 | /* Revision 0xC3 is UDMA66 for now */ | 553 | /* Revision 0xC3 is UDMA66 for now */ |
@@ -556,7 +556,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
556 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, | 556 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, |
557 | .pio_mask = 0x1f, | 557 | .pio_mask = 0x1f, |
558 | .mwdma_mask = 0x07, | 558 | .mwdma_mask = 0x07, |
559 | .udma_mask = 0x1f, | 559 | .udma_mask = ATA_UDMA4, |
560 | .port_ops = &ali_c2_port_ops | 560 | .port_ops = &ali_c2_port_ops |
561 | }; | 561 | }; |
562 | /* Revision 0xC4 is UDMA100 */ | 562 | /* Revision 0xC4 is UDMA100 */ |
@@ -565,7 +565,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
565 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, | 565 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, |
566 | .pio_mask = 0x1f, | 566 | .pio_mask = 0x1f, |
567 | .mwdma_mask = 0x07, | 567 | .mwdma_mask = 0x07, |
568 | .udma_mask = 0x3f, | 568 | .udma_mask = ATA_UDMA5, |
569 | .port_ops = &ali_c2_port_ops | 569 | .port_ops = &ali_c2_port_ops |
570 | }; | 570 | }; |
571 | /* Revision 0xC5 is UDMA133 with LBA48 DMA */ | 571 | /* Revision 0xC5 is UDMA133 with LBA48 DMA */ |
@@ -574,7 +574,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
574 | .flags = ATA_FLAG_SLAVE_POSS, | 574 | .flags = ATA_FLAG_SLAVE_POSS, |
575 | .pio_mask = 0x1f, | 575 | .pio_mask = 0x1f, |
576 | .mwdma_mask = 0x07, | 576 | .mwdma_mask = 0x07, |
577 | .udma_mask = 0x7f, | 577 | .udma_mask = ATA_UDMA6, |
578 | .port_ops = &ali_c5_port_ops | 578 | .port_ops = &ali_c5_port_ops |
579 | }; | 579 | }; |
580 | 580 | ||
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 533bcc9d154..b9c44c575ce 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -552,7 +552,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
552 | .flags = ATA_FLAG_SLAVE_POSS, | 552 | .flags = ATA_FLAG_SLAVE_POSS, |
553 | .pio_mask = 0x1f, | 553 | .pio_mask = 0x1f, |
554 | .mwdma_mask = 0x07, | 554 | .mwdma_mask = 0x07, |
555 | .udma_mask = 0x1f, /* UDMA 66 */ | 555 | .udma_mask = ATA_UDMA4, /* UDMA 66 */ |
556 | .port_ops = &amd66_port_ops | 556 | .port_ops = &amd66_port_ops |
557 | }, | 557 | }, |
558 | { /* 2: AMD 7409, no swdma errata */ | 558 | { /* 2: AMD 7409, no swdma errata */ |
@@ -560,7 +560,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
560 | .flags = ATA_FLAG_SLAVE_POSS, | 560 | .flags = ATA_FLAG_SLAVE_POSS, |
561 | .pio_mask = 0x1f, | 561 | .pio_mask = 0x1f, |
562 | .mwdma_mask = 0x07, | 562 | .mwdma_mask = 0x07, |
563 | .udma_mask = 0x1f, /* UDMA 66 */ | 563 | .udma_mask = ATA_UDMA4, /* UDMA 66 */ |
564 | .port_ops = &amd66_port_ops | 564 | .port_ops = &amd66_port_ops |
565 | }, | 565 | }, |
566 | { /* 3: AMD 7411 */ | 566 | { /* 3: AMD 7411 */ |
@@ -568,7 +568,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
568 | .flags = ATA_FLAG_SLAVE_POSS, | 568 | .flags = ATA_FLAG_SLAVE_POSS, |
569 | .pio_mask = 0x1f, | 569 | .pio_mask = 0x1f, |
570 | .mwdma_mask = 0x07, | 570 | .mwdma_mask = 0x07, |
571 | .udma_mask = 0x3f, /* UDMA 100 */ | 571 | .udma_mask = ATA_UDMA5, /* UDMA 100 */ |
572 | .port_ops = &amd100_port_ops | 572 | .port_ops = &amd100_port_ops |
573 | }, | 573 | }, |
574 | { /* 4: AMD 7441 */ | 574 | { /* 4: AMD 7441 */ |
@@ -576,7 +576,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
576 | .flags = ATA_FLAG_SLAVE_POSS, | 576 | .flags = ATA_FLAG_SLAVE_POSS, |
577 | .pio_mask = 0x1f, | 577 | .pio_mask = 0x1f, |
578 | .mwdma_mask = 0x07, | 578 | .mwdma_mask = 0x07, |
579 | .udma_mask = 0x3f, /* UDMA 100 */ | 579 | .udma_mask = ATA_UDMA5, /* UDMA 100 */ |
580 | .port_ops = &amd100_port_ops | 580 | .port_ops = &amd100_port_ops |
581 | }, | 581 | }, |
582 | { /* 5: AMD 8111*/ | 582 | { /* 5: AMD 8111*/ |
@@ -584,7 +584,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
584 | .flags = ATA_FLAG_SLAVE_POSS, | 584 | .flags = ATA_FLAG_SLAVE_POSS, |
585 | .pio_mask = 0x1f, | 585 | .pio_mask = 0x1f, |
586 | .mwdma_mask = 0x07, | 586 | .mwdma_mask = 0x07, |
587 | .udma_mask = 0x7f, /* UDMA 133, no swdma */ | 587 | .udma_mask = ATA_UDMA6, /* UDMA 133, no swdma */ |
588 | .port_ops = &amd133_port_ops | 588 | .port_ops = &amd133_port_ops |
589 | }, | 589 | }, |
590 | { /* 6: AMD 8111 UDMA 100 (Serenade) */ | 590 | { /* 6: AMD 8111 UDMA 100 (Serenade) */ |
@@ -592,7 +592,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
592 | .flags = ATA_FLAG_SLAVE_POSS, | 592 | .flags = ATA_FLAG_SLAVE_POSS, |
593 | .pio_mask = 0x1f, | 593 | .pio_mask = 0x1f, |
594 | .mwdma_mask = 0x07, | 594 | .mwdma_mask = 0x07, |
595 | .udma_mask = 0x3f, /* UDMA 100, no swdma */ | 595 | .udma_mask = ATA_UDMA5, /* UDMA 100, no swdma */ |
596 | .port_ops = &amd133_port_ops | 596 | .port_ops = &amd133_port_ops |
597 | }, | 597 | }, |
598 | { /* 7: Nvidia Nforce */ | 598 | { /* 7: Nvidia Nforce */ |
@@ -600,7 +600,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
600 | .flags = ATA_FLAG_SLAVE_POSS, | 600 | .flags = ATA_FLAG_SLAVE_POSS, |
601 | .pio_mask = 0x1f, | 601 | .pio_mask = 0x1f, |
602 | .mwdma_mask = 0x07, | 602 | .mwdma_mask = 0x07, |
603 | .udma_mask = 0x3f, /* UDMA 100 */ | 603 | .udma_mask = ATA_UDMA5, /* UDMA 100 */ |
604 | .port_ops = &nv100_port_ops | 604 | .port_ops = &nv100_port_ops |
605 | }, | 605 | }, |
606 | { /* 8: Nvidia Nforce2 and later */ | 606 | { /* 8: Nvidia Nforce2 and later */ |
@@ -608,7 +608,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
608 | .flags = ATA_FLAG_SLAVE_POSS, | 608 | .flags = ATA_FLAG_SLAVE_POSS, |
609 | .pio_mask = 0x1f, | 609 | .pio_mask = 0x1f, |
610 | .mwdma_mask = 0x07, | 610 | .mwdma_mask = 0x07, |
611 | .udma_mask = 0x7f, /* UDMA 133, no swdma */ | 611 | .udma_mask = ATA_UDMA6, /* UDMA 133, no swdma */ |
612 | .port_ops = &nv133_port_ops | 612 | .port_ops = &nv133_port_ops |
613 | }, | 613 | }, |
614 | { /* 9: AMD CS5536 (Geode companion) */ | 614 | { /* 9: AMD CS5536 (Geode companion) */ |
@@ -616,7 +616,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
616 | .flags = ATA_FLAG_SLAVE_POSS, | 616 | .flags = ATA_FLAG_SLAVE_POSS, |
617 | .pio_mask = 0x1f, | 617 | .pio_mask = 0x1f, |
618 | .mwdma_mask = 0x07, | 618 | .mwdma_mask = 0x07, |
619 | .udma_mask = 0x3f, /* UDMA 100 */ | 619 | .udma_mask = ATA_UDMA5, /* UDMA 100 */ |
620 | .port_ops = &amd100_port_ops | 620 | .port_ops = &amd100_port_ops |
621 | } | 621 | } |
622 | }; | 622 | }; |
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c index 7eeed578af0..360b6f32e17 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c | |||
@@ -228,7 +228,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
228 | .flags = ATA_FLAG_SLAVE_POSS, | 228 | .flags = ATA_FLAG_SLAVE_POSS, |
229 | .pio_mask = 0x1f, | 229 | .pio_mask = 0x1f, |
230 | .mwdma_mask = 0x07, | 230 | .mwdma_mask = 0x07, |
231 | .udma_mask = 0x1f, | 231 | .udma_mask = ATA_UDMA4, |
232 | .port_ops = &cs5535_port_ops | 232 | .port_ops = &cs5535_port_ops |
233 | }; | 233 | }; |
234 | const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; | 234 | const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; |
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index 7a6ff3dfc77..6f7d34ad19e 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c | |||
@@ -396,7 +396,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
396 | .flags = ATA_FLAG_SLAVE_POSS, | 396 | .flags = ATA_FLAG_SLAVE_POSS, |
397 | .pio_mask = 0x1f, | 397 | .pio_mask = 0x1f, |
398 | .mwdma_mask = 0x07, | 398 | .mwdma_mask = 0x07, |
399 | .udma_mask = 0x1f, | 399 | .udma_mask = ATA_UDMA4, |
400 | .port_ops = &hpt366_port_ops | 400 | .port_ops = &hpt366_port_ops |
401 | }; | 401 | }; |
402 | struct ata_port_info info = info_hpt366; | 402 | struct ata_port_info info = info_hpt366; |
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c index d2278fdb102..b0af65aadde 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c | |||
@@ -892,7 +892,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
892 | .flags = ATA_FLAG_SLAVE_POSS, | 892 | .flags = ATA_FLAG_SLAVE_POSS, |
893 | .pio_mask = 0x1f, | 893 | .pio_mask = 0x1f, |
894 | .mwdma_mask = 0x07, | 894 | .mwdma_mask = 0x07, |
895 | .udma_mask = 0x3f, | 895 | .udma_mask = ATA_UDMA5, |
896 | .port_ops = &hpt370_port_ops | 896 | .port_ops = &hpt370_port_ops |
897 | }; | 897 | }; |
898 | /* HPT370A - UDMA100 */ | 898 | /* HPT370A - UDMA100 */ |
@@ -901,7 +901,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
901 | .flags = ATA_FLAG_SLAVE_POSS, | 901 | .flags = ATA_FLAG_SLAVE_POSS, |
902 | .pio_mask = 0x1f, | 902 | .pio_mask = 0x1f, |
903 | .mwdma_mask = 0x07, | 903 | .mwdma_mask = 0x07, |
904 | .udma_mask = 0x3f, | 904 | .udma_mask = ATA_UDMA5, |
905 | .port_ops = &hpt370a_port_ops | 905 | .port_ops = &hpt370a_port_ops |
906 | }; | 906 | }; |
907 | /* HPT370 - UDMA100 */ | 907 | /* HPT370 - UDMA100 */ |
@@ -928,7 +928,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
928 | .flags = ATA_FLAG_SLAVE_POSS, | 928 | .flags = ATA_FLAG_SLAVE_POSS, |
929 | .pio_mask = 0x1f, | 929 | .pio_mask = 0x1f, |
930 | .mwdma_mask = 0x07, | 930 | .mwdma_mask = 0x07, |
931 | .udma_mask = 0x7f, | 931 | .udma_mask = ATA_UDMA6, |
932 | .port_ops = &hpt372_port_ops | 932 | .port_ops = &hpt372_port_ops |
933 | }; | 933 | }; |
934 | /* HPT374 - UDMA100 */ | 934 | /* HPT374 - UDMA100 */ |
@@ -937,7 +937,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
937 | .flags = ATA_FLAG_SLAVE_POSS, | 937 | .flags = ATA_FLAG_SLAVE_POSS, |
938 | .pio_mask = 0x1f, | 938 | .pio_mask = 0x1f, |
939 | .mwdma_mask = 0x07, | 939 | .mwdma_mask = 0x07, |
940 | .udma_mask = 0x3f, | 940 | .udma_mask = ATA_UDMA5, |
941 | .port_ops = &hpt374_port_ops | 941 | .port_ops = &hpt374_port_ops |
942 | }; | 942 | }; |
943 | 943 | ||
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c index 809d3385df7..aa29cde09f8 100644 --- a/drivers/ata/pata_hpt3x2n.c +++ b/drivers/ata/pata_hpt3x2n.c | |||
@@ -493,7 +493,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
493 | .flags = ATA_FLAG_SLAVE_POSS, | 493 | .flags = ATA_FLAG_SLAVE_POSS, |
494 | .pio_mask = 0x1f, | 494 | .pio_mask = 0x1f, |
495 | .mwdma_mask = 0x07, | 495 | .mwdma_mask = 0x07, |
496 | .udma_mask = 0x7f, | 496 | .udma_mask = ATA_UDMA6, |
497 | .port_ops = &hpt3x2n_port_ops | 497 | .port_ops = &hpt3x2n_port_ops |
498 | }; | 498 | }; |
499 | struct ata_port_info port = info; | 499 | struct ata_port_info port = info; |
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c index 41fb08bd177..b8af55e8915 100644 --- a/drivers/ata/pata_it8213.c +++ b/drivers/ata/pata_it8213.c | |||
@@ -316,7 +316,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *en | |||
316 | .flags = ATA_FLAG_SLAVE_POSS, | 316 | .flags = ATA_FLAG_SLAVE_POSS, |
317 | .pio_mask = 0x1f, /* pio0-4 */ | 317 | .pio_mask = 0x1f, /* pio0-4 */ |
318 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 318 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
319 | .udma_mask = 0x1f, /* UDMA 100 */ | 319 | .udma_mask = ATA_UDMA4, /* FIXME: want UDMA 100? */ |
320 | .port_ops = &it8213_ops, | 320 | .port_ops = &it8213_ops, |
321 | }; | 321 | }; |
322 | /* Current IT8213 stuff is single port */ | 322 | /* Current IT8213 stuff is single port */ |
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 4f26ef1665d..b67bbf6516b 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
@@ -724,7 +724,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
724 | .flags = ATA_FLAG_SLAVE_POSS, | 724 | .flags = ATA_FLAG_SLAVE_POSS, |
725 | .pio_mask = 0x1f, | 725 | .pio_mask = 0x1f, |
726 | .mwdma_mask = 0x07, | 726 | .mwdma_mask = 0x07, |
727 | .udma_mask = 0x7f, | 727 | .udma_mask = ATA_UDMA6, |
728 | .port_ops = &it821x_passthru_port_ops | 728 | .port_ops = &it821x_passthru_port_ops |
729 | }; | 729 | }; |
730 | 730 | ||
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c index 1a6c4dbba5c..4d67f238eee 100644 --- a/drivers/ata/pata_jmicron.c +++ b/drivers/ata/pata_jmicron.c | |||
@@ -197,7 +197,7 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i | |||
197 | 197 | ||
198 | .pio_mask = 0x1f, | 198 | .pio_mask = 0x1f, |
199 | .mwdma_mask = 0x07, | 199 | .mwdma_mask = 0x07, |
200 | .udma_mask = 0x3f, | 200 | .udma_mask = ATA_UDMA5, |
201 | 201 | ||
202 | .port_ops = &jmicron_ops, | 202 | .port_ops = &jmicron_ops, |
203 | }; | 203 | }; |
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 73f1e4b6603..87594c04d3a 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c | |||
@@ -167,7 +167,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i | |||
167 | 167 | ||
168 | .pio_mask = 0x1f, | 168 | .pio_mask = 0x1f, |
169 | .mwdma_mask = 0x07, | 169 | .mwdma_mask = 0x07, |
170 | .udma_mask = 0x3f, | 170 | .udma_mask = ATA_UDMA5, |
171 | 171 | ||
172 | .port_ops = &marvell_ops, | 172 | .port_ops = &marvell_ops, |
173 | }; | 173 | }; |
@@ -178,7 +178,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i | |||
178 | 178 | ||
179 | .pio_mask = 0x1f, | 179 | .pio_mask = 0x1f, |
180 | .mwdma_mask = 0x07, | 180 | .mwdma_mask = 0x07, |
181 | .udma_mask = 0x7f, | 181 | .udma_mask = ATA_UDMA6, |
182 | 182 | ||
183 | .port_ops = &marvell_ops, | 183 | .port_ops = &marvell_ops, |
184 | }; | 184 | }; |
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c index b7c8b13ffda..40eb574828b 100644 --- a/drivers/ata/pata_netcell.c +++ b/drivers/ata/pata_netcell.c | |||
@@ -99,7 +99,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e | |||
99 | firmware deals with it */ | 99 | firmware deals with it */ |
100 | .pio_mask = 0x1f, /* pio0-4 */ | 100 | .pio_mask = 0x1f, /* pio0-4 */ |
101 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 101 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
102 | .udma_mask = 0x3f, /* UDMA 133 */ | 102 | .udma_mask = ATA_UDMA5, /* UDMA 133 */ |
103 | .port_ops = &netcell_ops, | 103 | .port_ops = &netcell_ops, |
104 | }; | 104 | }; |
105 | const struct ata_port_info *port_info[] = { &info, NULL }; | 105 | const struct ata_port_info *port_info[] = { &info, NULL }; |
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c index 2c0bc3bb169..0231aba51ca 100644 --- a/drivers/ata/pata_serverworks.c +++ b/drivers/ata/pata_serverworks.c | |||
@@ -495,14 +495,14 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id | |||
495 | .flags = ATA_FLAG_SLAVE_POSS, | 495 | .flags = ATA_FLAG_SLAVE_POSS, |
496 | .pio_mask = 0x1f, | 496 | .pio_mask = 0x1f, |
497 | .mwdma_mask = 0x07, | 497 | .mwdma_mask = 0x07, |
498 | .udma_mask = 0x1f, | 498 | .udma_mask = ATA_UDMA4, |
499 | .port_ops = &serverworks_csb_port_ops | 499 | .port_ops = &serverworks_csb_port_ops |
500 | }, { /* CSB5 - later revisions*/ | 500 | }, { /* CSB5 - later revisions*/ |
501 | .sht = &serverworks_sht, | 501 | .sht = &serverworks_sht, |
502 | .flags = ATA_FLAG_SLAVE_POSS, | 502 | .flags = ATA_FLAG_SLAVE_POSS, |
503 | .pio_mask = 0x1f, | 503 | .pio_mask = 0x1f, |
504 | .mwdma_mask = 0x07, | 504 | .mwdma_mask = 0x07, |
505 | .udma_mask = 0x3f, | 505 | .udma_mask = ATA_UDMA5, |
506 | .port_ops = &serverworks_csb_port_ops | 506 | .port_ops = &serverworks_csb_port_ops |
507 | } | 507 | } |
508 | }; | 508 | }; |
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index 9b645c5ec95..b0cd52d6e3f 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
@@ -349,7 +349,7 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, | |||
349 | .flags = ATA_FLAG_SLAVE_POSS, | 349 | .flags = ATA_FLAG_SLAVE_POSS, |
350 | .pio_mask = 0x1f, | 350 | .pio_mask = 0x1f, |
351 | .mwdma_mask = 0x07, | 351 | .mwdma_mask = 0x07, |
352 | .udma_mask = 0x7f, | 352 | .udma_mask = ATA_UDMA6, |
353 | .port_ops = &sil680_port_ops | 353 | .port_ops = &sil680_port_ops |
354 | }; | 354 | }; |
355 | static const struct ata_port_info info_slow = { | 355 | static const struct ata_port_info info_slow = { |
@@ -357,7 +357,7 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, | |||
357 | .flags = ATA_FLAG_SLAVE_POSS, | 357 | .flags = ATA_FLAG_SLAVE_POSS, |
358 | .pio_mask = 0x1f, | 358 | .pio_mask = 0x1f, |
359 | .mwdma_mask = 0x07, | 359 | .mwdma_mask = 0x07, |
360 | .udma_mask = 0x3f, | 360 | .udma_mask = ATA_UDMA5, |
361 | .port_ops = &sil680_port_ops | 361 | .port_ops = &sil680_port_ops |
362 | }; | 362 | }; |
363 | const struct ata_port_info *ppi[] = { &info, NULL }; | 363 | const struct ata_port_info *ppi[] = { &info, NULL }; |
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 63eca299c62..f0cadbe6aa1 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
@@ -471,7 +471,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
471 | .flags = ATA_FLAG_SLAVE_POSS, | 471 | .flags = ATA_FLAG_SLAVE_POSS, |
472 | .pio_mask = 0x1f, | 472 | .pio_mask = 0x1f, |
473 | .mwdma_mask = 0x07, | 473 | .mwdma_mask = 0x07, |
474 | .udma_mask = 0x7, | 474 | .udma_mask = ATA_UDMA2, |
475 | .port_ops = &via_port_ops | 475 | .port_ops = &via_port_ops |
476 | }; | 476 | }; |
477 | /* VIA UDMA 66 devices */ | 477 | /* VIA UDMA 66 devices */ |
@@ -480,7 +480,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
480 | .flags = ATA_FLAG_SLAVE_POSS, | 480 | .flags = ATA_FLAG_SLAVE_POSS, |
481 | .pio_mask = 0x1f, | 481 | .pio_mask = 0x1f, |
482 | .mwdma_mask = 0x07, | 482 | .mwdma_mask = 0x07, |
483 | .udma_mask = 0x1f, | 483 | .udma_mask = ATA_UDMA4, |
484 | .port_ops = &via_port_ops | 484 | .port_ops = &via_port_ops |
485 | }; | 485 | }; |
486 | /* VIA UDMA 100 devices */ | 486 | /* VIA UDMA 100 devices */ |
@@ -489,7 +489,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
489 | .flags = ATA_FLAG_SLAVE_POSS, | 489 | .flags = ATA_FLAG_SLAVE_POSS, |
490 | .pio_mask = 0x1f, | 490 | .pio_mask = 0x1f, |
491 | .mwdma_mask = 0x07, | 491 | .mwdma_mask = 0x07, |
492 | .udma_mask = 0x3f, | 492 | .udma_mask = ATA_UDMA5, |
493 | .port_ops = &via_port_ops | 493 | .port_ops = &via_port_ops |
494 | }; | 494 | }; |
495 | /* UDMA133 with bad AST (All current 133) */ | 495 | /* UDMA133 with bad AST (All current 133) */ |
@@ -498,7 +498,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
498 | .flags = ATA_FLAG_SLAVE_POSS, | 498 | .flags = ATA_FLAG_SLAVE_POSS, |
499 | .pio_mask = 0x1f, | 499 | .pio_mask = 0x1f, |
500 | .mwdma_mask = 0x07, | 500 | .mwdma_mask = 0x07, |
501 | .udma_mask = 0x7f, /* FIXME: should check north bridge */ | 501 | .udma_mask = ATA_UDMA6, /* FIXME: should check north bridge */ |
502 | .port_ops = &via_port_ops | 502 | .port_ops = &via_port_ops |
503 | }; | 503 | }; |
504 | struct ata_port_info type; | 504 | struct ata_port_info type; |
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index 74c50c90e4d..bec1de594de 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c | |||
@@ -188,7 +188,7 @@ static struct ata_port_info adma_port_info[] = { | |||
188 | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | | 188 | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | |
189 | ATA_FLAG_PIO_POLLING, | 189 | ATA_FLAG_PIO_POLLING, |
190 | .pio_mask = 0x10, /* pio4 */ | 190 | .pio_mask = 0x10, /* pio4 */ |
191 | .udma_mask = 0x1f, /* udma0-4 */ | 191 | .udma_mask = ATA_UDMA4, |
192 | .port_ops = &adma_ata_ops, | 192 | .port_ops = &adma_ata_ops, |
193 | }, | 193 | }, |
194 | }; | 194 | }; |
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index 8efc5316b32..3de183461c3 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c | |||
@@ -594,7 +594,7 @@ static struct ata_port_info inic_port_info = { | |||
594 | .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA, | 594 | .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA, |
595 | .pio_mask = 0x1f, /* pio0-4 */ | 595 | .pio_mask = 0x1f, /* pio0-4 */ |
596 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 596 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
597 | .udma_mask = 0x7f, /* udma0-6 */ | 597 | .udma_mask = ATA_UDMA6, |
598 | .port_ops = &inic_port_ops | 598 | .port_ops = &inic_port_ops |
599 | }; | 599 | }; |
600 | 600 | ||
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 590f2f92b4e..d65ec234be5 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -526,44 +526,44 @@ static const struct ata_port_info mv_port_info[] = { | |||
526 | { /* chip_504x */ | 526 | { /* chip_504x */ |
527 | .flags = MV_COMMON_FLAGS, | 527 | .flags = MV_COMMON_FLAGS, |
528 | .pio_mask = 0x1f, /* pio0-4 */ | 528 | .pio_mask = 0x1f, /* pio0-4 */ |
529 | .udma_mask = 0x7f, /* udma0-6 */ | 529 | .udma_mask = ATA_UDMA6, |
530 | .port_ops = &mv5_ops, | 530 | .port_ops = &mv5_ops, |
531 | }, | 531 | }, |
532 | { /* chip_508x */ | 532 | { /* chip_508x */ |
533 | .flags = (MV_COMMON_FLAGS | MV_FLAG_DUAL_HC), | 533 | .flags = (MV_COMMON_FLAGS | MV_FLAG_DUAL_HC), |
534 | .pio_mask = 0x1f, /* pio0-4 */ | 534 | .pio_mask = 0x1f, /* pio0-4 */ |
535 | .udma_mask = 0x7f, /* udma0-6 */ | 535 | .udma_mask = ATA_UDMA6, |
536 | .port_ops = &mv5_ops, | 536 | .port_ops = &mv5_ops, |
537 | }, | 537 | }, |
538 | { /* chip_5080 */ | 538 | { /* chip_5080 */ |
539 | .flags = (MV_COMMON_FLAGS | MV_FLAG_DUAL_HC), | 539 | .flags = (MV_COMMON_FLAGS | MV_FLAG_DUAL_HC), |
540 | .pio_mask = 0x1f, /* pio0-4 */ | 540 | .pio_mask = 0x1f, /* pio0-4 */ |
541 | .udma_mask = 0x7f, /* udma0-6 */ | 541 | .udma_mask = ATA_UDMA6, |
542 | .port_ops = &mv5_ops, | 542 | .port_ops = &mv5_ops, |
543 | }, | 543 | }, |
544 | { /* chip_604x */ | 544 | { /* chip_604x */ |
545 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS), | 545 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS), |
546 | .pio_mask = 0x1f, /* pio0-4 */ | 546 | .pio_mask = 0x1f, /* pio0-4 */ |
547 | .udma_mask = 0x7f, /* udma0-6 */ | 547 | .udma_mask = ATA_UDMA6, |
548 | .port_ops = &mv6_ops, | 548 | .port_ops = &mv6_ops, |
549 | }, | 549 | }, |
550 | { /* chip_608x */ | 550 | { /* chip_608x */ |
551 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS | | 551 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS | |
552 | MV_FLAG_DUAL_HC), | 552 | MV_FLAG_DUAL_HC), |
553 | .pio_mask = 0x1f, /* pio0-4 */ | 553 | .pio_mask = 0x1f, /* pio0-4 */ |
554 | .udma_mask = 0x7f, /* udma0-6 */ | 554 | .udma_mask = ATA_UDMA6, |
555 | .port_ops = &mv6_ops, | 555 | .port_ops = &mv6_ops, |
556 | }, | 556 | }, |
557 | { /* chip_6042 */ | 557 | { /* chip_6042 */ |
558 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS), | 558 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS), |
559 | .pio_mask = 0x1f, /* pio0-4 */ | 559 | .pio_mask = 0x1f, /* pio0-4 */ |
560 | .udma_mask = 0x7f, /* udma0-6 */ | 560 | .udma_mask = ATA_UDMA6, |
561 | .port_ops = &mv_iie_ops, | 561 | .port_ops = &mv_iie_ops, |
562 | }, | 562 | }, |
563 | { /* chip_7042 */ | 563 | { /* chip_7042 */ |
564 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS), | 564 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS), |
565 | .pio_mask = 0x1f, /* pio0-4 */ | 565 | .pio_mask = 0x1f, /* pio0-4 */ |
566 | .udma_mask = 0x7f, /* udma0-6 */ | 566 | .udma_mask = ATA_UDMA6, |
567 | .port_ops = &mv_iie_ops, | 567 | .port_ops = &mv_iie_ops, |
568 | }, | 568 | }, |
569 | }; | 569 | }; |
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index 6688ccb6632..9ab554da89b 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c | |||
@@ -176,7 +176,7 @@ static const struct ata_port_info qs_port_info[] = { | |||
176 | //FIXME ATA_FLAG_SRST | | 176 | //FIXME ATA_FLAG_SRST | |
177 | ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING, | 177 | ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING, |
178 | .pio_mask = 0x10, /* pio4 */ | 178 | .pio_mask = 0x10, /* pio4 */ |
179 | .udma_mask = 0x7f, /* udma0-6 */ | 179 | .udma_mask = ATA_UDMA6, |
180 | .port_ops = &qs_ata_ops, | 180 | .port_ops = &qs_ata_ops, |
181 | }, | 181 | }, |
182 | }; | 182 | }; |
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index c3f0a86cb73..2a86dc4598d 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -218,7 +218,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
218 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE, | 218 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE, |
219 | .pio_mask = 0x1f, /* pio0-4 */ | 219 | .pio_mask = 0x1f, /* pio0-4 */ |
220 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 220 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
221 | .udma_mask = 0x3f, /* udma0-5 */ | 221 | .udma_mask = ATA_UDMA5, |
222 | .port_ops = &sil_ops, | 222 | .port_ops = &sil_ops, |
223 | }, | 223 | }, |
224 | /* sil_3112_no_sata_irq */ | 224 | /* sil_3112_no_sata_irq */ |
@@ -227,7 +227,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
227 | SIL_FLAG_NO_SATA_IRQ, | 227 | SIL_FLAG_NO_SATA_IRQ, |
228 | .pio_mask = 0x1f, /* pio0-4 */ | 228 | .pio_mask = 0x1f, /* pio0-4 */ |
229 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 229 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
230 | .udma_mask = 0x3f, /* udma0-5 */ | 230 | .udma_mask = ATA_UDMA5, |
231 | .port_ops = &sil_ops, | 231 | .port_ops = &sil_ops, |
232 | }, | 232 | }, |
233 | /* sil_3512 */ | 233 | /* sil_3512 */ |
@@ -235,7 +235,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
235 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, | 235 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, |
236 | .pio_mask = 0x1f, /* pio0-4 */ | 236 | .pio_mask = 0x1f, /* pio0-4 */ |
237 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 237 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
238 | .udma_mask = 0x3f, /* udma0-5 */ | 238 | .udma_mask = ATA_UDMA5, |
239 | .port_ops = &sil_ops, | 239 | .port_ops = &sil_ops, |
240 | }, | 240 | }, |
241 | /* sil_3114 */ | 241 | /* sil_3114 */ |
@@ -243,7 +243,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
243 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, | 243 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, |
244 | .pio_mask = 0x1f, /* pio0-4 */ | 244 | .pio_mask = 0x1f, /* pio0-4 */ |
245 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 245 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
246 | .udma_mask = 0x3f, /* udma0-5 */ | 246 | .udma_mask = ATA_UDMA5, |
247 | .port_ops = &sil_ops, | 247 | .port_ops = &sil_ops, |
248 | }, | 248 | }, |
249 | }; | 249 | }; |
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 14261f393c6..ac43a30ebe2 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
@@ -426,7 +426,7 @@ static const struct ata_port_info sil24_port_info[] = { | |||
426 | SIL24_FLAG_PCIX_IRQ_WOC, | 426 | SIL24_FLAG_PCIX_IRQ_WOC, |
427 | .pio_mask = 0x1f, /* pio0-4 */ | 427 | .pio_mask = 0x1f, /* pio0-4 */ |
428 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 428 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
429 | .udma_mask = 0x3f, /* udma0-5 */ | 429 | .udma_mask = ATA_UDMA5, /* udma0-5 */ |
430 | .port_ops = &sil24_ops, | 430 | .port_ops = &sil24_ops, |
431 | }, | 431 | }, |
432 | /* sil_3132 */ | 432 | /* sil_3132 */ |
@@ -434,7 +434,7 @@ static const struct ata_port_info sil24_port_info[] = { | |||
434 | .flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2), | 434 | .flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2), |
435 | .pio_mask = 0x1f, /* pio0-4 */ | 435 | .pio_mask = 0x1f, /* pio0-4 */ |
436 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 436 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
437 | .udma_mask = 0x3f, /* udma0-5 */ | 437 | .udma_mask = ATA_UDMA5, /* udma0-5 */ |
438 | .port_ops = &sil24_ops, | 438 | .port_ops = &sil24_ops, |
439 | }, | 439 | }, |
440 | /* sil_3131/sil_3531 */ | 440 | /* sil_3131/sil_3531 */ |
@@ -442,7 +442,7 @@ static const struct ata_port_info sil24_port_info[] = { | |||
442 | .flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1), | 442 | .flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1), |
443 | .pio_mask = 0x1f, /* pio0-4 */ | 443 | .pio_mask = 0x1f, /* pio0-4 */ |
444 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 444 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
445 | .udma_mask = 0x3f, /* udma0-5 */ | 445 | .udma_mask = ATA_UDMA5, /* udma0-5 */ |
446 | .port_ops = &sil24_ops, | 446 | .port_ops = &sil24_ops, |
447 | }, | 447 | }, |
448 | }; | 448 | }; |
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index f111c984a35..fd80bcf1b23 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
@@ -133,7 +133,7 @@ static const struct ata_port_info sis_port_info = { | |||
133 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 133 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
134 | .pio_mask = 0x1f, | 134 | .pio_mask = 0x1f, |
135 | .mwdma_mask = 0x7, | 135 | .mwdma_mask = 0x7, |
136 | .udma_mask = 0x7f, | 136 | .udma_mask = ATA_UDMA6, |
137 | .port_ops = &sis_ops, | 137 | .port_ops = &sis_ops, |
138 | }; | 138 | }; |
139 | 139 | ||
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 4fd4f107187..63fe99afd59 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -361,7 +361,7 @@ static const struct ata_port_info k2_port_info[] = { | |||
361 | ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA, | 361 | ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA, |
362 | .pio_mask = 0x1f, | 362 | .pio_mask = 0x1f, |
363 | .mwdma_mask = 0x07, | 363 | .mwdma_mask = 0x07, |
364 | .udma_mask = 0x7f, | 364 | .udma_mask = ATA_UDMA6, |
365 | .port_ops = &k2_sata_ops, | 365 | .port_ops = &k2_sata_ops, |
366 | }, | 366 | }, |
367 | /* board_svw8 */ | 367 | /* board_svw8 */ |
@@ -371,7 +371,7 @@ static const struct ata_port_info k2_port_info[] = { | |||
371 | K2_FLAG_SATA_8_PORTS, | 371 | K2_FLAG_SATA_8_PORTS, |
372 | .pio_mask = 0x1f, | 372 | .pio_mask = 0x1f, |
373 | .mwdma_mask = 0x07, | 373 | .mwdma_mask = 0x07, |
374 | .udma_mask = 0x7f, | 374 | .udma_mask = ATA_UDMA6, |
375 | .port_ops = &k2_sata_ops, | 375 | .port_ops = &k2_sata_ops, |
376 | }, | 376 | }, |
377 | }; | 377 | }; |
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index 6815de7cca7..aca71819f6e 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
@@ -129,7 +129,7 @@ static const struct ata_port_info uli_port_info = { | |||
129 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 129 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
130 | ATA_FLAG_IGN_SIMPLEX, | 130 | ATA_FLAG_IGN_SIMPLEX, |
131 | .pio_mask = 0x1f, /* pio0-4 */ | 131 | .pio_mask = 0x1f, /* pio0-4 */ |
132 | .udma_mask = 0x7f, /* udma0-6 */ | 132 | .udma_mask = ATA_UDMA6, |
133 | .port_ops = &uli_ops, | 133 | .port_ops = &uli_ops, |
134 | }; | 134 | }; |
135 | 135 | ||
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index e816965ef4f..a4c0832033d 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
@@ -223,7 +223,7 @@ static const struct ata_port_info vt6420_port_info = { | |||
223 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 223 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
224 | .pio_mask = 0x1f, | 224 | .pio_mask = 0x1f, |
225 | .mwdma_mask = 0x07, | 225 | .mwdma_mask = 0x07, |
226 | .udma_mask = 0x7f, | 226 | .udma_mask = ATA_UDMA6, |
227 | .port_ops = &vt6420_sata_ops, | 227 | .port_ops = &vt6420_sata_ops, |
228 | }; | 228 | }; |
229 | 229 | ||
@@ -231,7 +231,7 @@ static struct ata_port_info vt6421_sport_info = { | |||
231 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 231 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
232 | .pio_mask = 0x1f, | 232 | .pio_mask = 0x1f, |
233 | .mwdma_mask = 0x07, | 233 | .mwdma_mask = 0x07, |
234 | .udma_mask = 0x7f, | 234 | .udma_mask = ATA_UDMA6, |
235 | .port_ops = &vt6421_sata_ops, | 235 | .port_ops = &vt6421_sata_ops, |
236 | }; | 236 | }; |
237 | 237 | ||
@@ -239,7 +239,7 @@ static struct ata_port_info vt6421_pport_info = { | |||
239 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY, | 239 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY, |
240 | .pio_mask = 0x1f, | 240 | .pio_mask = 0x1f, |
241 | .mwdma_mask = 0, | 241 | .mwdma_mask = 0, |
242 | .udma_mask = 0x7f, | 242 | .udma_mask = ATA_UDMA6, |
243 | .port_ops = &vt6421_pata_ops, | 243 | .port_ops = &vt6421_pata_ops, |
244 | }; | 244 | }; |
245 | 245 | ||
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c index 81330175fc8..1b5d81faa10 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c | |||
@@ -371,7 +371,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d | |||
371 | ATA_FLAG_MMIO, | 371 | ATA_FLAG_MMIO, |
372 | .pio_mask = 0x1f, | 372 | .pio_mask = 0x1f, |
373 | .mwdma_mask = 0x07, | 373 | .mwdma_mask = 0x07, |
374 | .udma_mask = 0x7f, | 374 | .udma_mask = ATA_UDMA6, |
375 | .port_ops = &vsc_sata_ops, | 375 | .port_ops = &vsc_sata_ops, |
376 | }; | 376 | }; |
377 | const struct ata_port_info *ppi[] = { &pi, NULL }; | 377 | const struct ata_port_info *ppi[] = { &pi, NULL }; |