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/pata_amd.c | |
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/pata_amd.c')
-rw-r--r-- | drivers/ata/pata_amd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 533bcc9d1542..b9c44c575ce3 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 | }; |