diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-02-04 14:05:48 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2011-03-02 02:36:46 -0500 |
commit | 9cbe056f6c467e7395d5aec39aceec47812eb98e (patch) | |
tree | 3ca13e73718fc14fc39f3d875dc3a1f724a255c4 | |
parent | 3696df309971b3427cb9cb039138a1732a865a0b (diff) |
libata: remove ATA_FLAG_NO_LEGACY
All checks of ATA_FLAG_NO_LEGACY have been removed by the commits
c791c30670ea61f19eec390124128bf278e854fe ([libata] minor PCI IDE probe
fixes and cleanups) and f0d36efdc624beb3d9e29b9ab9e9537bf0f25d5b (libata:
update libata core layer to use devres), so I think it's time to finally
get rid of this flag...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/ata/ahci.c | 3 | ||||
-rw-r--r-- | drivers/ata/ahci.h | 3 | ||||
-rw-r--r-- | drivers/ata/pata_bf54x.c | 3 | ||||
-rw-r--r-- | drivers/ata/pata_ixp4xx_cf.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_macio.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_octeon_cf.c | 3 | ||||
-rw-r--r-- | drivers/ata/pata_palmld.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_pdc2027x.c | 4 | ||||
-rw-r--r-- | drivers/ata/pata_rb532_cf.c | 1 | ||||
-rw-r--r-- | drivers/ata/pata_scc.c | 2 | ||||
-rw-r--r-- | drivers/ata/pdc_adma.c | 3 | ||||
-rw-r--r-- | drivers/ata/sata_dwc_460ex.c | 3 | ||||
-rw-r--r-- | drivers/ata/sata_fsl.c | 5 | ||||
-rw-r--r-- | drivers/ata/sata_mv.c | 3 | ||||
-rw-r--r-- | drivers/ata/sata_nv.c | 14 | ||||
-rw-r--r-- | drivers/ata/sata_promise.c | 3 | ||||
-rw-r--r-- | drivers/ata/sata_qstor.c | 3 | ||||
-rw-r--r-- | drivers/ata/sata_sil.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_sil24.c | 7 | ||||
-rw-r--r-- | drivers/ata/sata_sis.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_svw.c | 12 | ||||
-rw-r--r-- | drivers/ata/sata_sx4.c | 4 | ||||
-rw-r--r-- | drivers/ata/sata_uli.c | 3 | ||||
-rw-r--r-- | drivers/ata/sata_via.c | 9 | ||||
-rw-r--r-- | drivers/ata/sata_vsc.c | 2 | ||||
-rw-r--r-- | drivers/scsi/ipr.c | 2 | ||||
-rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 3 | ||||
-rw-r--r-- | include/linux/libata.h | 1 |
28 files changed, 43 insertions, 63 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 3a0435181f77..6856d877a69b 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -175,8 +175,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
175 | { | 175 | { |
176 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI | | 176 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI | |
177 | AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), | 177 | AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), |
178 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 178 | .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA, |
179 | ATA_FLAG_PIO_DMA, | ||
180 | .pio_mask = ATA_PIO4, | 179 | .pio_mask = ATA_PIO4, |
181 | .udma_mask = ATA_UDMA6, | 180 | .udma_mask = ATA_UDMA6, |
182 | .port_ops = &ahci_ops, | 181 | .port_ops = &ahci_ops, |
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 9a323417907e..fd75844fb009 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h | |||
@@ -213,8 +213,7 @@ enum { | |||
213 | 213 | ||
214 | /* ap->flags bits */ | 214 | /* ap->flags bits */ |
215 | 215 | ||
216 | AHCI_FLAG_COMMON = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 216 | AHCI_FLAG_COMMON = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | |
217 | ATA_FLAG_PIO_DMA | | ||
218 | ATA_FLAG_ACPI_SATA | ATA_FLAG_AN | | 217 | ATA_FLAG_ACPI_SATA | ATA_FLAG_AN | |
219 | ATA_FLAG_LPM, | 218 | ATA_FLAG_LPM, |
220 | 219 | ||
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index 1086cacf3cf5..e0b58b8dfe6f 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c | |||
@@ -1454,8 +1454,7 @@ static struct ata_port_operations bfin_pata_ops = { | |||
1454 | 1454 | ||
1455 | static struct ata_port_info bfin_port_info[] = { | 1455 | static struct ata_port_info bfin_port_info[] = { |
1456 | { | 1456 | { |
1457 | .flags = ATA_FLAG_SLAVE_POSS | 1457 | .flags = ATA_FLAG_SLAVE_POSS, |
1458 | | ATA_FLAG_NO_LEGACY, | ||
1459 | .pio_mask = ATA_PIO4, | 1458 | .pio_mask = ATA_PIO4, |
1460 | .mwdma_mask = 0, | 1459 | .mwdma_mask = 0, |
1461 | .udma_mask = 0, | 1460 | .udma_mask = 0, |
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c index 783ec4fc1119..5253b271b3fe 100644 --- a/drivers/ata/pata_ixp4xx_cf.c +++ b/drivers/ata/pata_ixp4xx_cf.c | |||
@@ -177,7 +177,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev) | |||
177 | 177 | ||
178 | ap->ops = &ixp4xx_port_ops; | 178 | ap->ops = &ixp4xx_port_ops; |
179 | ap->pio_mask = ATA_PIO4; | 179 | ap->pio_mask = ATA_PIO4; |
180 | ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI; | 180 | ap->flags |= ATA_FLAG_NO_ATAPI; |
181 | 181 | ||
182 | ixp4xx_setup_port(ap, data, cs0->start, cs1->start); | 182 | ixp4xx_setup_port(ap, data, cs0->start, cs1->start); |
183 | 183 | ||
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 7f7b883c008e..46f589edccdb 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c | |||
@@ -1053,7 +1053,7 @@ static int __devinit pata_macio_common_init(struct pata_macio_priv *priv, | |||
1053 | /* Allocate libata host for 1 port */ | 1053 | /* Allocate libata host for 1 port */ |
1054 | memset(&pinfo, 0, sizeof(struct ata_port_info)); | 1054 | memset(&pinfo, 0, sizeof(struct ata_port_info)); |
1055 | pmac_macio_calc_timing_masks(priv, &pinfo); | 1055 | pmac_macio_calc_timing_masks(priv, &pinfo); |
1056 | pinfo.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY; | 1056 | pinfo.flags = ATA_FLAG_SLAVE_POSS; |
1057 | pinfo.port_ops = &pata_macio_ops; | 1057 | pinfo.port_ops = &pata_macio_ops; |
1058 | pinfo.private_data = priv; | 1058 | pinfo.private_data = priv; |
1059 | 1059 | ||
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index 18703e2e51c6..220ddc90608f 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c | |||
@@ -848,8 +848,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev) | |||
848 | cf_port->ap = ap; | 848 | cf_port->ap = ap; |
849 | ap->ops = &octeon_cf_ops; | 849 | ap->ops = &octeon_cf_ops; |
850 | ap->pio_mask = ATA_PIO6; | 850 | ap->pio_mask = ATA_PIO6; |
851 | ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI | 851 | ap->flags |= ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING; |
852 | | ATA_FLAG_PIO_POLLING; | ||
853 | 852 | ||
854 | base = cs0 + ocd->base_region_bias; | 853 | base = cs0 + ocd->base_region_bias; |
855 | if (!ocd->is16bit) { | 854 | if (!ocd->is16bit) { |
diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c index 462a5fcebab9..a2a73d953840 100644 --- a/drivers/ata/pata_palmld.c +++ b/drivers/ata/pata_palmld.c | |||
@@ -85,7 +85,7 @@ static __devinit int palmld_pata_probe(struct platform_device *pdev) | |||
85 | ap = host->ports[0]; | 85 | ap = host->ports[0]; |
86 | ap->ops = &palmld_port_ops; | 86 | ap->ops = &palmld_port_ops; |
87 | ap->pio_mask = ATA_PIO4; | 87 | ap->pio_mask = ATA_PIO4; |
88 | ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_POLLING; | 88 | ap->flags |= ATA_FLAG_PIO_POLLING; |
89 | 89 | ||
90 | /* memory mapping voodoo */ | 90 | /* memory mapping voodoo */ |
91 | ap->ioaddr.cmd_addr = mem + 0x10; | 91 | ap->ioaddr.cmd_addr = mem + 0x10; |
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c index 57ef92ce1a5c..9765ace16921 100644 --- a/drivers/ata/pata_pdc2027x.c +++ b/drivers/ata/pata_pdc2027x.c | |||
@@ -150,7 +150,7 @@ static struct ata_port_operations pdc2027x_pata133_ops = { | |||
150 | static struct ata_port_info pdc2027x_port_info[] = { | 150 | static struct ata_port_info pdc2027x_port_info[] = { |
151 | /* PDC_UDMA_100 */ | 151 | /* PDC_UDMA_100 */ |
152 | { | 152 | { |
153 | .flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS, | 153 | .flags = ATA_FLAG_SLAVE_POSS, |
154 | .pio_mask = ATA_PIO4, | 154 | .pio_mask = ATA_PIO4, |
155 | .mwdma_mask = ATA_MWDMA2, | 155 | .mwdma_mask = ATA_MWDMA2, |
156 | .udma_mask = ATA_UDMA5, | 156 | .udma_mask = ATA_UDMA5, |
@@ -158,7 +158,7 @@ static struct ata_port_info pdc2027x_port_info[] = { | |||
158 | }, | 158 | }, |
159 | /* PDC_UDMA_133 */ | 159 | /* PDC_UDMA_133 */ |
160 | { | 160 | { |
161 | .flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS, | 161 | .flags = ATA_FLAG_SLAVE_POSS, |
162 | .pio_mask = ATA_PIO4, | 162 | .pio_mask = ATA_PIO4, |
163 | .mwdma_mask = ATA_MWDMA2, | 163 | .mwdma_mask = ATA_MWDMA2, |
164 | .udma_mask = ATA_UDMA6, | 164 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c index 0365a5d714f6..baeaf938d55b 100644 --- a/drivers/ata/pata_rb532_cf.c +++ b/drivers/ata/pata_rb532_cf.c | |||
@@ -91,7 +91,6 @@ static void rb532_pata_setup_ports(struct ata_host *ah) | |||
91 | 91 | ||
92 | ap->ops = &rb532_pata_port_ops; | 92 | ap->ops = &rb532_pata_port_ops; |
93 | ap->pio_mask = ATA_PIO4; | 93 | ap->pio_mask = ATA_PIO4; |
94 | ap->flags = ATA_FLAG_NO_LEGACY; | ||
95 | 94 | ||
96 | ap->ioaddr.cmd_addr = info->iobase + RB500_CF_REG_BASE; | 95 | ap->ioaddr.cmd_addr = info->iobase + RB500_CF_REG_BASE; |
97 | ap->ioaddr.ctl_addr = info->iobase + RB500_CF_REG_CTRL; | 96 | ap->ioaddr.ctl_addr = info->iobase + RB500_CF_REG_CTRL; |
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index 5eb050086f38..88ea9b677b47 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c | |||
@@ -959,7 +959,7 @@ static struct ata_port_operations scc_pata_ops = { | |||
959 | 959 | ||
960 | static struct ata_port_info scc_port_info[] = { | 960 | static struct ata_port_info scc_port_info[] = { |
961 | { | 961 | { |
962 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY, | 962 | .flags = ATA_FLAG_SLAVE_POSS, |
963 | .pio_mask = ATA_PIO4, | 963 | .pio_mask = ATA_PIO4, |
964 | /* No MWDMA */ | 964 | /* No MWDMA */ |
965 | .udma_mask = ATA_UDMA6, | 965 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index 384f202fbdec..1111712b3d7d 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c | |||
@@ -166,8 +166,7 @@ static struct ata_port_operations adma_ata_ops = { | |||
166 | static struct ata_port_info adma_port_info[] = { | 166 | static struct ata_port_info adma_port_info[] = { |
167 | /* board_1841_idx */ | 167 | /* board_1841_idx */ |
168 | { | 168 | { |
169 | .flags = ATA_FLAG_SLAVE_POSS | | 169 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_POLLING, |
170 | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_POLLING, | ||
171 | .pio_mask = ATA_PIO4_ONLY, | 170 | .pio_mask = ATA_PIO4_ONLY, |
172 | .udma_mask = ATA_UDMA4, | 171 | .udma_mask = ATA_UDMA4, |
173 | .port_ops = &adma_ata_ops, | 172 | .port_ops = &adma_ata_ops, |
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c index 8c37b0e7fad8..712ab5a4922e 100644 --- a/drivers/ata/sata_dwc_460ex.c +++ b/drivers/ata/sata_dwc_460ex.c | |||
@@ -1618,8 +1618,7 @@ static struct ata_port_operations sata_dwc_ops = { | |||
1618 | 1618 | ||
1619 | static const struct ata_port_info sata_dwc_port_info[] = { | 1619 | static const struct ata_port_info sata_dwc_port_info[] = { |
1620 | { | 1620 | { |
1621 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 1621 | .flags = ATA_FLAG_SATA | ATA_FLAG_NCQ, |
1622 | ATA_FLAG_NCQ, | ||
1623 | .pio_mask = ATA_PIO4, | 1622 | .pio_mask = ATA_PIO4, |
1624 | .udma_mask = ATA_UDMA6, | 1623 | .udma_mask = ATA_UDMA6, |
1625 | .port_ops = &sata_dwc_ops, | 1624 | .port_ops = &sata_dwc_ops, |
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 1d70cf714275..beef37134a04 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
@@ -33,9 +33,8 @@ enum { | |||
33 | SATA_FSL_MAX_PRD_USABLE = SATA_FSL_MAX_PRD - 1, | 33 | SATA_FSL_MAX_PRD_USABLE = SATA_FSL_MAX_PRD - 1, |
34 | SATA_FSL_MAX_PRD_DIRECT = 16, /* Direct PRDT entries */ | 34 | SATA_FSL_MAX_PRD_DIRECT = 16, /* Direct PRDT entries */ |
35 | 35 | ||
36 | SATA_FSL_HOST_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 36 | SATA_FSL_HOST_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | |
37 | ATA_FLAG_PIO_DMA | ATA_FLAG_PMP | | 37 | ATA_FLAG_PMP | ATA_FLAG_NCQ | ATA_FLAG_AN), |
38 | ATA_FLAG_NCQ | ATA_FLAG_AN), | ||
39 | 38 | ||
40 | SATA_FSL_MAX_CMDS = SATA_FSL_QUEUE_DEPTH, | 39 | SATA_FSL_MAX_CMDS = SATA_FSL_QUEUE_DEPTH, |
41 | SATA_FSL_CMD_HDR_SIZE = 16, /* 4 DWORDS */ | 40 | SATA_FSL_CMD_HDR_SIZE = 16, /* 4 DWORDS */ |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index a2193fc52763..cd40651e9b72 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -160,8 +160,7 @@ enum { | |||
160 | /* Host Flags */ | 160 | /* Host Flags */ |
161 | MV_FLAG_DUAL_HC = (1 << 30), /* two SATA Host Controllers */ | 161 | MV_FLAG_DUAL_HC = (1 << 30), /* two SATA Host Controllers */ |
162 | 162 | ||
163 | MV_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 163 | MV_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_PIO_POLLING, |
164 | ATA_FLAG_PIO_POLLING, | ||
165 | 164 | ||
166 | MV_GEN_I_FLAGS = MV_COMMON_FLAGS | ATA_FLAG_NO_ATAPI, | 165 | MV_GEN_I_FLAGS = MV_COMMON_FLAGS | ATA_FLAG_NO_ATAPI, |
167 | 166 | ||
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index cca96e89339d..42344e3c686d 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -539,7 +539,7 @@ struct nv_pi_priv { | |||
539 | static const struct ata_port_info nv_port_info[] = { | 539 | static const struct ata_port_info nv_port_info[] = { |
540 | /* generic */ | 540 | /* generic */ |
541 | { | 541 | { |
542 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 542 | .flags = ATA_FLAG_SATA, |
543 | .pio_mask = NV_PIO_MASK, | 543 | .pio_mask = NV_PIO_MASK, |
544 | .mwdma_mask = NV_MWDMA_MASK, | 544 | .mwdma_mask = NV_MWDMA_MASK, |
545 | .udma_mask = NV_UDMA_MASK, | 545 | .udma_mask = NV_UDMA_MASK, |
@@ -548,7 +548,7 @@ static const struct ata_port_info nv_port_info[] = { | |||
548 | }, | 548 | }, |
549 | /* nforce2/3 */ | 549 | /* nforce2/3 */ |
550 | { | 550 | { |
551 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 551 | .flags = ATA_FLAG_SATA, |
552 | .pio_mask = NV_PIO_MASK, | 552 | .pio_mask = NV_PIO_MASK, |
553 | .mwdma_mask = NV_MWDMA_MASK, | 553 | .mwdma_mask = NV_MWDMA_MASK, |
554 | .udma_mask = NV_UDMA_MASK, | 554 | .udma_mask = NV_UDMA_MASK, |
@@ -557,7 +557,7 @@ static const struct ata_port_info nv_port_info[] = { | |||
557 | }, | 557 | }, |
558 | /* ck804 */ | 558 | /* ck804 */ |
559 | { | 559 | { |
560 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 560 | .flags = ATA_FLAG_SATA, |
561 | .pio_mask = NV_PIO_MASK, | 561 | .pio_mask = NV_PIO_MASK, |
562 | .mwdma_mask = NV_MWDMA_MASK, | 562 | .mwdma_mask = NV_MWDMA_MASK, |
563 | .udma_mask = NV_UDMA_MASK, | 563 | .udma_mask = NV_UDMA_MASK, |
@@ -566,8 +566,7 @@ static const struct ata_port_info nv_port_info[] = { | |||
566 | }, | 566 | }, |
567 | /* ADMA */ | 567 | /* ADMA */ |
568 | { | 568 | { |
569 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 569 | .flags = ATA_FLAG_SATA | ATA_FLAG_NCQ, |
570 | ATA_FLAG_NCQ, | ||
571 | .pio_mask = NV_PIO_MASK, | 570 | .pio_mask = NV_PIO_MASK, |
572 | .mwdma_mask = NV_MWDMA_MASK, | 571 | .mwdma_mask = NV_MWDMA_MASK, |
573 | .udma_mask = NV_UDMA_MASK, | 572 | .udma_mask = NV_UDMA_MASK, |
@@ -576,7 +575,7 @@ static const struct ata_port_info nv_port_info[] = { | |||
576 | }, | 575 | }, |
577 | /* MCP5x */ | 576 | /* MCP5x */ |
578 | { | 577 | { |
579 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 578 | .flags = ATA_FLAG_SATA, |
580 | .pio_mask = NV_PIO_MASK, | 579 | .pio_mask = NV_PIO_MASK, |
581 | .mwdma_mask = NV_MWDMA_MASK, | 580 | .mwdma_mask = NV_MWDMA_MASK, |
582 | .udma_mask = NV_UDMA_MASK, | 581 | .udma_mask = NV_UDMA_MASK, |
@@ -585,8 +584,7 @@ static const struct ata_port_info nv_port_info[] = { | |||
585 | }, | 584 | }, |
586 | /* SWNCQ */ | 585 | /* SWNCQ */ |
587 | { | 586 | { |
588 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 587 | .flags = ATA_FLAG_SATA | ATA_FLAG_NCQ, |
589 | ATA_FLAG_NCQ, | ||
590 | .pio_mask = NV_PIO_MASK, | 588 | .pio_mask = NV_PIO_MASK, |
591 | .mwdma_mask = NV_MWDMA_MASK, | 589 | .mwdma_mask = NV_MWDMA_MASK, |
592 | .udma_mask = NV_UDMA_MASK, | 590 | .udma_mask = NV_UDMA_MASK, |
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index b0cba3cd9361..a004b1e0ea6d 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -134,8 +134,7 @@ enum { | |||
134 | PDC_IRQ_DISABLE = (1 << 10), | 134 | PDC_IRQ_DISABLE = (1 << 10), |
135 | PDC_RESET = (1 << 11), /* HDMA reset */ | 135 | PDC_RESET = (1 << 11), /* HDMA reset */ |
136 | 136 | ||
137 | PDC_COMMON_FLAGS = ATA_FLAG_NO_LEGACY | | 137 | PDC_COMMON_FLAGS = ATA_FLAG_PIO_POLLING, |
138 | ATA_FLAG_PIO_POLLING, | ||
139 | 138 | ||
140 | /* ap->flags bits */ | 139 | /* ap->flags bits */ |
141 | PDC_FLAG_GEN_II = (1 << 24), | 140 | PDC_FLAG_GEN_II = (1 << 24), |
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index 5e30a7994391..c5603265fa58 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c | |||
@@ -155,8 +155,7 @@ static struct ata_port_operations qs_ata_ops = { | |||
155 | static const struct ata_port_info qs_port_info[] = { | 155 | static const struct ata_port_info qs_port_info[] = { |
156 | /* board_2068_idx */ | 156 | /* board_2068_idx */ |
157 | { | 157 | { |
158 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 158 | .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_POLLING, |
159 | ATA_FLAG_PIO_POLLING, | ||
160 | .pio_mask = ATA_PIO4_ONLY, | 159 | .pio_mask = ATA_PIO4_ONLY, |
161 | .udma_mask = ATA_UDMA6, | 160 | .udma_mask = ATA_UDMA6, |
162 | .port_ops = &qs_ata_ops, | 161 | .port_ops = &qs_ata_ops, |
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 0742d3d968e0..b42edaaf3a53 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -61,7 +61,7 @@ enum { | |||
61 | SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29), | 61 | SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29), |
62 | SIL_FLAG_MOD15WRITE = (1 << 30), | 62 | SIL_FLAG_MOD15WRITE = (1 << 30), |
63 | 63 | ||
64 | SIL_DFL_PORT_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 64 | SIL_DFL_PORT_FLAGS = ATA_FLAG_SATA, |
65 | 65 | ||
66 | /* | 66 | /* |
67 | * Controller IDs | 67 | * Controller IDs |
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 1ad7b94f0b38..06c564e55051 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
@@ -244,10 +244,9 @@ enum { | |||
244 | BID_SIL3131 = 2, | 244 | BID_SIL3131 = 2, |
245 | 245 | ||
246 | /* host flags */ | 246 | /* host flags */ |
247 | SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 247 | SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | |
248 | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ | | 248 | ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA | |
249 | ATA_FLAG_ACPI_SATA | ATA_FLAG_AN | | 249 | ATA_FLAG_AN | ATA_FLAG_PMP, |
250 | ATA_FLAG_PMP, | ||
251 | SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */ | 250 | SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */ |
252 | 251 | ||
253 | IRQ_STAT_4PORTS = 0xf, | 252 | IRQ_STAT_4PORTS = 0xf, |
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index 2bfe3ae03976..cdcc13e9cf51 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
@@ -96,7 +96,7 @@ static struct ata_port_operations sis_ops = { | |||
96 | }; | 96 | }; |
97 | 97 | ||
98 | static const struct ata_port_info sis_port_info = { | 98 | static const struct ata_port_info sis_port_info = { |
99 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 99 | .flags = ATA_FLAG_SATA, |
100 | .pio_mask = ATA_PIO4, | 100 | .pio_mask = ATA_PIO4, |
101 | .mwdma_mask = ATA_MWDMA2, | 101 | .mwdma_mask = ATA_MWDMA2, |
102 | .udma_mask = ATA_UDMA6, | 102 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index adc913a35189..35eabcf34568 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -359,8 +359,7 @@ static struct ata_port_operations k2_sata_ops = { | |||
359 | static const struct ata_port_info k2_port_info[] = { | 359 | static const struct ata_port_info k2_port_info[] = { |
360 | /* chip_svw4 */ | 360 | /* chip_svw4 */ |
361 | { | 361 | { |
362 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 362 | .flags = ATA_FLAG_SATA | K2_FLAG_NO_ATAPI_DMA, |
363 | K2_FLAG_NO_ATAPI_DMA, | ||
364 | .pio_mask = ATA_PIO4, | 363 | .pio_mask = ATA_PIO4, |
365 | .mwdma_mask = ATA_MWDMA2, | 364 | .mwdma_mask = ATA_MWDMA2, |
366 | .udma_mask = ATA_UDMA6, | 365 | .udma_mask = ATA_UDMA6, |
@@ -368,8 +367,8 @@ static const struct ata_port_info k2_port_info[] = { | |||
368 | }, | 367 | }, |
369 | /* chip_svw8 */ | 368 | /* chip_svw8 */ |
370 | { | 369 | { |
371 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 370 | .flags = ATA_FLAG_SATA | K2_FLAG_NO_ATAPI_DMA | |
372 | K2_FLAG_NO_ATAPI_DMA | K2_FLAG_SATA_8_PORTS, | 371 | K2_FLAG_SATA_8_PORTS, |
373 | .pio_mask = ATA_PIO4, | 372 | .pio_mask = ATA_PIO4, |
374 | .mwdma_mask = ATA_MWDMA2, | 373 | .mwdma_mask = ATA_MWDMA2, |
375 | .udma_mask = ATA_UDMA6, | 374 | .udma_mask = ATA_UDMA6, |
@@ -377,8 +376,7 @@ static const struct ata_port_info k2_port_info[] = { | |||
377 | }, | 376 | }, |
378 | /* chip_svw42 */ | 377 | /* chip_svw42 */ |
379 | { | 378 | { |
380 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 379 | .flags = ATA_FLAG_SATA | K2_FLAG_BAR_POS_3, |
381 | K2_FLAG_BAR_POS_3, | ||
382 | .pio_mask = ATA_PIO4, | 380 | .pio_mask = ATA_PIO4, |
383 | .mwdma_mask = ATA_MWDMA2, | 381 | .mwdma_mask = ATA_MWDMA2, |
384 | .udma_mask = ATA_UDMA6, | 382 | .udma_mask = ATA_UDMA6, |
@@ -386,7 +384,7 @@ static const struct ata_port_info k2_port_info[] = { | |||
386 | }, | 384 | }, |
387 | /* chip_svw43 */ | 385 | /* chip_svw43 */ |
388 | { | 386 | { |
389 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 387 | .flags = ATA_FLAG_SATA, |
390 | .pio_mask = ATA_PIO4, | 388 | .pio_mask = ATA_PIO4, |
391 | .mwdma_mask = ATA_MWDMA2, | 389 | .mwdma_mask = ATA_MWDMA2, |
392 | .udma_mask = ATA_UDMA6, | 390 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index d58e656bef70..8fd3b7252bda 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
@@ -273,8 +273,8 @@ static struct ata_port_operations pdc_20621_ops = { | |||
273 | static const struct ata_port_info pdc_port_info[] = { | 273 | static const struct ata_port_info pdc_port_info[] = { |
274 | /* board_20621 */ | 274 | /* board_20621 */ |
275 | { | 275 | { |
276 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 276 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_ATAPI | |
277 | ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING, | 277 | ATA_FLAG_PIO_POLLING, |
278 | .pio_mask = ATA_PIO4, | 278 | .pio_mask = ATA_PIO4, |
279 | .mwdma_mask = ATA_MWDMA2, | 279 | .mwdma_mask = ATA_MWDMA2, |
280 | .udma_mask = ATA_UDMA6, | 280 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index b8578c32d344..235be717a713 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
@@ -88,8 +88,7 @@ static struct ata_port_operations uli_ops = { | |||
88 | }; | 88 | }; |
89 | 89 | ||
90 | static const struct ata_port_info uli_port_info = { | 90 | static const struct ata_port_info uli_port_info = { |
91 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 91 | .flags = ATA_FLAG_SATA | ATA_FLAG_IGN_SIMPLEX, |
92 | ATA_FLAG_IGN_SIMPLEX, | ||
93 | .pio_mask = ATA_PIO4, | 92 | .pio_mask = ATA_PIO4, |
94 | .udma_mask = ATA_UDMA6, | 93 | .udma_mask = ATA_UDMA6, |
95 | .port_ops = &uli_ops, | 94 | .port_ops = &uli_ops, |
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 8b677bbf2d37..21242c5709a0 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
@@ -148,7 +148,7 @@ static struct ata_port_operations vt8251_ops = { | |||
148 | }; | 148 | }; |
149 | 149 | ||
150 | static const struct ata_port_info vt6420_port_info = { | 150 | static const struct ata_port_info vt6420_port_info = { |
151 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 151 | .flags = ATA_FLAG_SATA, |
152 | .pio_mask = ATA_PIO4, | 152 | .pio_mask = ATA_PIO4, |
153 | .mwdma_mask = ATA_MWDMA2, | 153 | .mwdma_mask = ATA_MWDMA2, |
154 | .udma_mask = ATA_UDMA6, | 154 | .udma_mask = ATA_UDMA6, |
@@ -156,7 +156,7 @@ static const struct ata_port_info vt6420_port_info = { | |||
156 | }; | 156 | }; |
157 | 157 | ||
158 | static struct ata_port_info vt6421_sport_info = { | 158 | static struct ata_port_info vt6421_sport_info = { |
159 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 159 | .flags = ATA_FLAG_SATA, |
160 | .pio_mask = ATA_PIO4, | 160 | .pio_mask = ATA_PIO4, |
161 | .mwdma_mask = ATA_MWDMA2, | 161 | .mwdma_mask = ATA_MWDMA2, |
162 | .udma_mask = ATA_UDMA6, | 162 | .udma_mask = ATA_UDMA6, |
@@ -164,7 +164,7 @@ static struct ata_port_info vt6421_sport_info = { | |||
164 | }; | 164 | }; |
165 | 165 | ||
166 | static struct ata_port_info vt6421_pport_info = { | 166 | static struct ata_port_info vt6421_pport_info = { |
167 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY, | 167 | .flags = ATA_FLAG_SLAVE_POSS, |
168 | .pio_mask = ATA_PIO4, | 168 | .pio_mask = ATA_PIO4, |
169 | /* No MWDMA */ | 169 | /* No MWDMA */ |
170 | .udma_mask = ATA_UDMA6, | 170 | .udma_mask = ATA_UDMA6, |
@@ -172,8 +172,7 @@ static struct ata_port_info vt6421_pport_info = { | |||
172 | }; | 172 | }; |
173 | 173 | ||
174 | static struct ata_port_info vt8251_port_info = { | 174 | static struct ata_port_info vt8251_port_info = { |
175 | .flags = ATA_FLAG_SATA | ATA_FLAG_SLAVE_POSS | | 175 | .flags = ATA_FLAG_SATA | ATA_FLAG_SLAVE_POSS, |
176 | ATA_FLAG_NO_LEGACY, | ||
177 | .pio_mask = ATA_PIO4, | 176 | .pio_mask = ATA_PIO4, |
178 | .mwdma_mask = ATA_MWDMA2, | 177 | .mwdma_mask = ATA_MWDMA2, |
179 | .udma_mask = ATA_UDMA6, | 178 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c index 192bdc7d8f6e..7c987371136e 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c | |||
@@ -340,7 +340,7 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev, | |||
340 | const struct pci_device_id *ent) | 340 | const struct pci_device_id *ent) |
341 | { | 341 | { |
342 | static const struct ata_port_info pi = { | 342 | static const struct ata_port_info pi = { |
343 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 343 | .flags = ATA_FLAG_SATA, |
344 | .pio_mask = ATA_PIO4, | 344 | .pio_mask = ATA_PIO4, |
345 | .mwdma_mask = ATA_MWDMA2, | 345 | .mwdma_mask = ATA_MWDMA2, |
346 | .udma_mask = ATA_UDMA6, | 346 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index e437c8ae9d41..d841e98a8bd5 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -6219,7 +6219,7 @@ static struct ata_port_operations ipr_sata_ops = { | |||
6219 | }; | 6219 | }; |
6220 | 6220 | ||
6221 | static struct ata_port_info sata_port_info = { | 6221 | static struct ata_port_info sata_port_info = { |
6222 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_DMA, | 6222 | .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA, |
6223 | .pio_mask = ATA_PIO4_ONLY, | 6223 | .pio_mask = ATA_PIO4_ONLY, |
6224 | .mwdma_mask = ATA_MWDMA2, | 6224 | .mwdma_mask = ATA_MWDMA2, |
6225 | .udma_mask = ATA_UDMA6, | 6225 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 7538b6ffb3fe..4d3b704ede1c 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c | |||
@@ -372,8 +372,7 @@ static struct ata_port_operations sas_sata_ops = { | |||
372 | }; | 372 | }; |
373 | 373 | ||
374 | static struct ata_port_info sata_port_info = { | 374 | static struct ata_port_info sata_port_info = { |
375 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_DMA | | 375 | .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ, |
376 | ATA_FLAG_NCQ, | ||
377 | .pio_mask = ATA_PIO4, | 376 | .pio_mask = ATA_PIO4, |
378 | .mwdma_mask = ATA_MWDMA2, | 377 | .mwdma_mask = ATA_MWDMA2, |
379 | .udma_mask = ATA_UDMA6, | 378 | .udma_mask = ATA_UDMA6, |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 0c3d9e144891..26d80479c75f 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -179,7 +179,6 @@ enum { | |||
179 | ATA_FLAG_SLAVE_POSS = (1 << 0), /* host supports slave dev */ | 179 | ATA_FLAG_SLAVE_POSS = (1 << 0), /* host supports slave dev */ |
180 | /* (doesn't imply presence) */ | 180 | /* (doesn't imply presence) */ |
181 | ATA_FLAG_SATA = (1 << 1), | 181 | ATA_FLAG_SATA = (1 << 1), |
182 | ATA_FLAG_NO_LEGACY = (1 << 2), /* no legacy mode check */ | ||
183 | ATA_FLAG_NO_ATAPI = (1 << 6), /* No ATAPI support */ | 182 | ATA_FLAG_NO_ATAPI = (1 << 6), /* No ATAPI support */ |
184 | ATA_FLAG_PIO_DMA = (1 << 7), /* PIO cmds via DMA */ | 183 | ATA_FLAG_PIO_DMA = (1 << 7), /* PIO cmds via DMA */ |
185 | ATA_FLAG_PIO_LBA48 = (1 << 8), /* Host DMA engine is LBA28 only */ | 184 | ATA_FLAG_PIO_LBA48 = (1 << 8), /* Host DMA engine is LBA28 only */ |