aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_mv.c
diff options
context:
space:
mode:
authorMark Lord <liml@rtr.ca>2008-05-14 09:21:43 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-05-19 17:28:07 -0400
commitad3aef51e17b9c6a90a9014805f1645e8e441c17 (patch)
tree6271fb5d1a35b45e76e8797b541c69ea8db8a238 /drivers/ata/sata_mv.c
parente40060772d85f3534d3d517197696e24bb01f45b (diff)
sata_mv: group genIIe flags
Group all of the flags for GenIIe devices into a common definition, to ensure that any updates to them are shared by all GenIIe devices. This will help make future maintenance somewhat simpler. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/sata_mv.c')
-rw-r--r--drivers/ata/sata_mv.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 2a23d7ae4769..52e992ce59a4 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -128,8 +128,13 @@ enum {
128 MV_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | 128 MV_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
129 ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI | 129 ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI |
130 ATA_FLAG_PIO_POLLING, 130 ATA_FLAG_PIO_POLLING,
131
131 MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE, 132 MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE,
132 133
134 MV_GENIIE_FLAGS = MV_COMMON_FLAGS | MV_6XXX_FLAGS |
135 ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |
136 ATA_FLAG_NCQ,
137
133 CRQB_FLAG_READ = (1 << 0), 138 CRQB_FLAG_READ = (1 << 0),
134 CRQB_TAG_SHIFT = 1, 139 CRQB_TAG_SHIFT = 1,
135 CRQB_IOID_SHIFT = 6, /* CRQB Gen-II/IIE IO Id shift */ 140 CRQB_IOID_SHIFT = 6, /* CRQB Gen-II/IIE IO Id shift */
@@ -640,25 +645,19 @@ static const struct ata_port_info mv_port_info[] = {
640 .port_ops = &mv6_ops, 645 .port_ops = &mv6_ops,
641 }, 646 },
642 { /* chip_6042 */ 647 { /* chip_6042 */
643 .flags = MV_COMMON_FLAGS | MV_6XXX_FLAGS | 648 .flags = MV_GENIIE_FLAGS,
644 ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |
645 ATA_FLAG_NCQ,
646 .pio_mask = 0x1f, /* pio0-4 */ 649 .pio_mask = 0x1f, /* pio0-4 */
647 .udma_mask = ATA_UDMA6, 650 .udma_mask = ATA_UDMA6,
648 .port_ops = &mv_iie_ops, 651 .port_ops = &mv_iie_ops,
649 }, 652 },
650 { /* chip_7042 */ 653 { /* chip_7042 */
651 .flags = MV_COMMON_FLAGS | MV_6XXX_FLAGS | 654 .flags = MV_GENIIE_FLAGS,
652 ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |
653 ATA_FLAG_NCQ,
654 .pio_mask = 0x1f, /* pio0-4 */ 655 .pio_mask = 0x1f, /* pio0-4 */
655 .udma_mask = ATA_UDMA6, 656 .udma_mask = ATA_UDMA6,
656 .port_ops = &mv_iie_ops, 657 .port_ops = &mv_iie_ops,
657 }, 658 },
658 { /* chip_soc */ 659 { /* chip_soc */
659 .flags = MV_COMMON_FLAGS | MV_6XXX_FLAGS | 660 .flags = MV_GENIIE_FLAGS | MV_FLAG_SOC,
660 ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |
661 ATA_FLAG_NCQ | MV_FLAG_SOC,
662 .pio_mask = 0x1f, /* pio0-4 */ 661 .pio_mask = 0x1f, /* pio0-4 */
663 .udma_mask = ATA_UDMA6, 662 .udma_mask = ATA_UDMA6,
664 .port_ops = &mv_iie_ops, 663 .port_ops = &mv_iie_ops,