libata: remove ATA_FLAG_MMIO

Commit 0d5ff566779f894ca9937231a181eb31e4adff0e (libata: convert to iomap)
removed all checks of ATA_FLAG_MMIO but neglected to remove the flag itself.
Do it now, at last...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index b8d96ce37fc99798af81a27a2604f890cf6c4518..3a0435181f77d9057474b050c77d465c7fcfcaa5 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -176,7 +176,7 @@ static const struct ata_port_info ahci_port_info[] = {
                AHCI_HFLAGS     (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI |
                                 AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP),
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,
+                                 ATA_FLAG_PIO_DMA,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = ATA_UDMA6,
                .port_ops       = &ahci_ops,

diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 3e606c34f57ba58af87ab7014e51cc32d2f5d67b..9a323417907e6e281bf238e4ed7ab11af951c01e 100644 (file)
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -214,7 +214,7 @@ enum {
        /* ap->flags bits */
 
        AHCI_FLAG_COMMON                = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                         ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+                                         ATA_FLAG_PIO_DMA |
                                          ATA_FLAG_ACPI_SATA | ATA_FLAG_AN |
                                          ATA_FLAG_LPM,
 

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 8b5ea399a4f4fa7dfe04765292f31af4c8750fba..a791b8ce6294432de996b2ac7ffdf31298c61c14 100644 (file)
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -660,8 +660,7 @@ static int ata_acpi_filter_tf(struct ata_device *dev,
  * @dev: target ATA device
  * @gtf: raw ATA taskfile register set (0x1f1 - 0x1f7)
  *
- * Outputs ATA taskfile to standard ATA host controller using MMIO
- * or PIO as indicated by the ATA_FLAG_MMIO flag.
+ * Outputs ATA taskfile to standard ATA host controller.
  * Writes the control, feature, nsect, lbal, lbam, and lbah registers.
  * Optionally (ATA_TFLAG_LBA48) writes hob_feature, hob_nsect,
  * hob_lbal, hob_lbam, and hob_lbah.

diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
index 66ce6a526f2732d186630cef161678aeb0052853..36f189c7ee8c4f89ebe022ce91b0fe366fdc77e1 100644 (file)
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
@@ -194,7 +194,7 @@ static int __init pata_at32_init_one(struct device *dev,
        /* Setup ATA bindings */
        ap->ops      = &at32_port_ops;
        ap->pio_mask = PIO_MASK;
-       ap->flags   |= ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS;
+       ap->flags   |= ATA_FLAG_SLAVE_POSS;
 
        /*
         * Since all 8-bit taskfile transfers has to go on the lower

diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 7aed5c792597c07918545610515af2daf6fabd1e..1086cacf3cf55737a6581447fca529f1e9679440 100644 (file)
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1455,7 +1455,6 @@ static struct ata_port_operations bfin_pata_ops = {
 static struct ata_port_info bfin_port_info[] = {
        {
                .flags          = ATA_FLAG_SLAVE_POSS
-                               | ATA_FLAG_MMIO
                                | ATA_FLAG_NO_LEGACY,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = 0,

diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index ba54b089f98c799edbaf4a8848d5b9ed072406e2..783ec4fc11195aa899387e75d650cf8c6082a210 100644 (file)
--- 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)
 
        ap->ops = &ixp4xx_port_ops;
        ap->pio_mask = ATA_PIO4;
-       ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI;
+       ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI;
 
        ixp4xx_setup_port(ap, data, cs0->start, cs1->start);
 

diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 75b49d01780bbf1933b59852abbca49d88fa29d5..7f7b883c008e880b06ddcd9032c8f07b5a7d3864 100644 (file)
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -1053,8 +1053,7 @@ static int __devinit pata_macio_common_init(struct pata_macio_priv        *priv,
        /* Allocate libata host for 1 port */
        memset(&pinfo, 0, sizeof(struct ata_port_info));
        pmac_macio_calc_timing_masks(priv, &pinfo);
-       pinfo.flags             = ATA_FLAG_SLAVE_POSS | ATA_FLAG_MMIO |
-                                 ATA_FLAG_NO_LEGACY;
+       pinfo.flags             = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY;
        pinfo.port_ops          = &pata_macio_ops;
        pinfo.private_data      = priv;
 

diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index fa1b95a9a7ff3268e6893877ac35718063368875..18703e2e51c6f3bda1205e1805b4322bb2628675 100644 (file)
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -848,8 +848,8 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)
        cf_port->ap = ap;
        ap->ops = &octeon_cf_ops;
        ap->pio_mask = ATA_PIO6;
-       ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY
-                 | ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING;
+       ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI
+                 | ATA_FLAG_PIO_POLLING;
 
        base = cs0 + ocd->base_region_bias;
        if (!ocd->is16bit) {

diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c
index 11fb4ccc74b4b631fb72ae2d643d404497f3833f..462a5fcebab9895b91f3f25f706f24a99bc83664 100644 (file)
--- 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)
        ap = host->ports[0];
        ap->ops = &palmld_port_ops;
        ap->pio_mask = ATA_PIO4;
-       ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_POLLING;
+       ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_POLLING;
 
        /* memory mapping voodoo */
        ap->ioaddr.cmd_addr = mem + 0x10;

diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index b183511225252bcd2411021c78fefd8e5ac5a752..57ef92ce1a5c4e22f2f8d834edd11e2d85690e10 100644 (file)
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -150,8 +150,7 @@ static struct ata_port_operations pdc2027x_pata133_ops = {
 static struct ata_port_info pdc2027x_port_info[] = {
        /* PDC_UDMA_100 */
        {
-               .flags          = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS |
-                                 ATA_FLAG_MMIO,
+               .flags          = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA5,
@@ -159,8 +158,7 @@ static struct ata_port_info pdc2027x_port_info[] = {
        },
        /* PDC_UDMA_133 */
        {
-               .flags          = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS |
-                                 ATA_FLAG_MMIO,
+               .flags          = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA6,

diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
index 1898c6ed4b4ecad201f9dc411bad19a2286fa87a..b4ede40f8ae15189c20300dd585e8045e54efb6c 100644 (file)
--- a/drivers/ata/pata_pxa.c
+++ b/drivers/ata/pata_pxa.c
@@ -292,7 +292,6 @@ static int __devinit pxa_ata_probe(struct platform_device *pdev)
        ap->ops         = &pxa_ata_port_ops;
        ap->pio_mask    = ATA_PIO4;
        ap->mwdma_mask  = ATA_MWDMA2;
-       ap->flags       = ATA_FLAG_MMIO;
 
        ap->ioaddr.cmd_addr     = devm_ioremap(&pdev->dev, cmd_res->start,
                                                resource_size(cmd_res));

diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index 0ffd631000b76daf758668321bf2f7a4b7568945..0365a5d714f6f6489ed8aeae8241e8dc53c73ed0 100644 (file)
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -91,7 +91,7 @@ static void rb532_pata_setup_ports(struct ata_host *ah)
 
        ap->ops         = &rb532_pata_port_ops;
        ap->pio_mask    = ATA_PIO4;
-       ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
+       ap->flags       = ATA_FLAG_NO_LEGACY;
 
        ap->ioaddr.cmd_addr     = info->iobase + RB500_CF_REG_BASE;
        ap->ioaddr.ctl_addr     = info->iobase + RB500_CF_REG_CTRL;

diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
index 8a51d673e5b29e5073978ba9cdc11baa314fc88f..c446ae6055a32d1a141d3be5606d6bf3791ea07f 100644 (file)
--- a/drivers/ata/pata_samsung_cf.c
+++ b/drivers/ata/pata_samsung_cf.c
@@ -531,7 +531,6 @@ static int __init pata_s3c_probe(struct platform_device *pdev)
        }
 
        ap = host->ports[0];
-       ap->flags |= ATA_FLAG_MMIO;
        ap->pio_mask = ATA_PIO4;
 
        if (cpu_type == TYPE_S3C64XX) {

diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 093715c3273a9fd0fa00cec911f83972710615fa..5eb050086f38e24a7f3b8115cf4fc580d1fd089d 100644 (file)
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -959,7 +959,7 @@ static struct ata_port_operations scc_pata_ops = {
 
 static struct ata_port_info scc_port_info[] = {
        {
-               .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY,
+               .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY,
                .pio_mask       = ATA_PIO4,
                /* No MWDMA */
                .udma_mask      = ATA_UDMA6,

diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index adbe0426c8f08a13a3ec53ff7fb51f58d65b9597..384f202fbdeceab623b9a802258b9494a2fb787d 100644 (file)
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -167,8 +167,7 @@ static struct ata_port_info adma_port_info[] = {
        /* board_1841_idx */
        {
                .flags          = ATA_FLAG_SLAVE_POSS |
-                                 ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
-                                 ATA_FLAG_PIO_POLLING,
+                                 ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_POLLING,
                .pio_mask       = ATA_PIO4_ONLY,
                .udma_mask      = ATA_UDMA4,
                .port_ops       = &adma_ata_ops,

diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 843af13606e1db461b84976d3f06c71b1bf25f34..8c37b0e7fad83f091949f0058a6cf5c358cb70d3 100644 (file)
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -1619,7 +1619,7 @@ static struct ata_port_operations sata_dwc_ops = {
 static const struct ata_port_info sata_dwc_port_info[] = {
        {
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | ATA_FLAG_NCQ,
+                                 ATA_FLAG_NCQ,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = ATA_UDMA6,
                .port_ops       = &sata_dwc_ops,

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index b0214d00d50bb469de76b40fb8a4f81f70cbb161..1d70cf714275a8edc459369c0e93f89c16de8def 100644 (file)
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -34,8 +34,8 @@ enum {
        SATA_FSL_MAX_PRD_DIRECT = 16,   /* Direct PRDT entries */
 
        SATA_FSL_HOST_FLAGS     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                               ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
-                               ATA_FLAG_PMP | ATA_FLAG_NCQ | ATA_FLAG_AN),
+                               ATA_FLAG_PIO_DMA | ATA_FLAG_PMP |
+                               ATA_FLAG_NCQ | ATA_FLAG_AN),
 
        SATA_FSL_MAX_CMDS       = SATA_FSL_QUEUE_DEPTH,
        SATA_FSL_CMD_HDR_SIZE   = 16,   /* 4 DWORDS */

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index bf74a36d3cc3b4904363e97d4656c9e48fbe1a6f..a2193fc52763465ac4250d5f64ac323550a7cacb 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -161,7 +161,7 @@ enum {
        MV_FLAG_DUAL_HC         = (1 << 30),  /* two SATA Host Controllers */
 
        MV_COMMON_FLAGS         = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING,
+                                 ATA_FLAG_PIO_POLLING,
 
        MV_GEN_I_FLAGS          = MV_COMMON_FLAGS | ATA_FLAG_NO_ATAPI,
 

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 7254e255fd7868b6bfdb82d4d1e17dec560bebb0..cca96e89339d1c1f40b8adefba1be963409e38a0 100644 (file)
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -567,7 +567,7 @@ static const struct ata_port_info nv_port_info[] = {
        /* ADMA */
        {
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | ATA_FLAG_NCQ,
+                                 ATA_FLAG_NCQ,
                .pio_mask       = NV_PIO_MASK,
                .mwdma_mask     = NV_MWDMA_MASK,
                .udma_mask      = NV_UDMA_MASK,

diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index f03ad48273ffe10117cc82984f0f4b3be0f34bcc..b0cba3cd93618ff8e220bcfa3b2ecc89de2fb9ae 100644 (file)
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -135,7 +135,6 @@ enum {
        PDC_RESET               = (1 << 11), /* HDMA reset */
 
        PDC_COMMON_FLAGS        = ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO |
                                  ATA_FLAG_PIO_POLLING,
 
        /* ap->flags bits */

diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index daeebf19a6a90bf84a6b2e60a60d08105b21e917..5e30a799439132e4be09d12a97ed6ed0a370fc39 100644 (file)
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -156,7 +156,7 @@ static const struct ata_port_info qs_port_info[] = {
        /* board_2068_idx */
        {
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING,
+                                 ATA_FLAG_PIO_POLLING,
                .pio_mask       = ATA_PIO4_ONLY,
                .udma_mask      = ATA_UDMA6,
                .port_ops       = &qs_ata_ops,

diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 3a4f842197197a8d121fa7431c3c083dcf0f4afc..0742d3d968e0ab24b6e760c27f2f7704706c5ca1 100644 (file)
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -61,8 +61,7 @@ enum {
        SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29),
        SIL_FLAG_MOD15WRITE     = (1 << 30),
 
-       SIL_DFL_PORT_FLAGS      = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO,
+       SIL_DFL_PORT_FLAGS      = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
 
        /*
         * Controller IDs

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index af41c6fd1254876028866b53a323fe2edb1aac8b..1ad7b94f0b38a30ff10d99f565fb954607a01442 100644 (file)
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -245,9 +245,9 @@ enum {
 
        /* host flags */
        SIL24_COMMON_FLAGS      = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
-                                 ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA |
-                                 ATA_FLAG_AN | ATA_FLAG_PMP,
+                                 ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ |
+                                 ATA_FLAG_ACPI_SATA | ATA_FLAG_AN |
+                                 ATA_FLAG_PMP,
        SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */
 
        IRQ_STAT_4PORTS         = 0xf,

diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 7d9db4aaf07e659196b011d5fcdf89bb594d9f3a..adc913a35189fdedecdc24c2c0955b97737618b5 100644 (file)
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -360,7 +360,7 @@ static const struct ata_port_info k2_port_info[] = {
        /* chip_svw4 */
        {
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA,
+                                 K2_FLAG_NO_ATAPI_DMA,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA6,
@@ -369,8 +369,7 @@ static const struct ata_port_info k2_port_info[] = {
        /* chip_svw8 */
        {
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA |
-                                 K2_FLAG_SATA_8_PORTS,
+                                 K2_FLAG_NO_ATAPI_DMA | K2_FLAG_SATA_8_PORTS,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA6,
@@ -379,7 +378,7 @@ static const struct ata_port_info k2_port_info[] = {
        /* chip_svw42 */
        {
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | K2_FLAG_BAR_POS_3,
+                                 K2_FLAG_BAR_POS_3,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA6,
@@ -387,8 +386,7 @@ static const struct ata_port_info k2_port_info[] = {
        },
        /* chip_svw43 */
        {
-               .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO,
+               .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA6,

diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 76384d077b2d1563ebecc1627995c85763772e95..d58e656bef702ef6240839c89afb9211c0e4c087 100644 (file)
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -274,8 +274,7 @@ static const struct ata_port_info pdc_port_info[] = {
        /* board_20621 */
        {
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI |
-                                 ATA_FLAG_PIO_POLLING,
+                                 ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA6,

diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index e079cf29ed5d2dd9e17bb11e6b340f864e0b9dbd..192bdc7d8f6e105ea6db1e117329200705ef8f8b 100644 (file)
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -340,8 +340,7 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev,
                                       const struct pci_device_id *ent)
 {
        static const struct ata_port_info pi = {
-               .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO,
+               .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA6,

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 6443ce7c41aef90f357c7bf27678ee0e48fe2734..e437c8ae9d414dd1275b408e05019ac9dd183dfb 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -6219,8 +6219,7 @@ static struct ata_port_operations ipr_sata_ops = {
 };
 
 static struct ata_port_info sata_port_info = {
-       .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
-                         ATA_FLAG_PIO_DMA,
+       .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_DMA,
        .pio_mask       = ATA_PIO4_ONLY,
        .mwdma_mask     = ATA_MWDMA2,
        .udma_mask      = ATA_UDMA6,

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 996dbda4714130cd59454323385a37979442f150..7538b6ffb3fe6b1ae96baf4f6f26c694f855ca41 100644 (file)
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -372,8 +372,8 @@ static struct ata_port_operations sas_sata_ops = {
 };
 
 static struct ata_port_info sata_port_info = {
-       .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
-                ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ,
+       .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_DMA |
+                ATA_FLAG_NCQ,
        .pio_mask = ATA_PIO4,
        .mwdma_mask = ATA_MWDMA2,
        .udma_mask = ATA_UDMA6,

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 51ec439f75ada53af7728030874eb9801013e6a3..0c3d9e1448915444594083b53b366599b20b3598 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -180,7 +180,6 @@ enum {
                                            /* (doesn't imply presence) */
        ATA_FLAG_SATA           = (1 << 1),
        ATA_FLAG_NO_LEGACY      = (1 << 2), /* no legacy mode check */
-       ATA_FLAG_MMIO           = (1 << 3), /* use MMIO, not PIO */
        ATA_FLAG_NO_ATAPI       = (1 << 6), /* No ATAPI support */
        ATA_FLAG_PIO_DMA        = (1 << 7), /* PIO cmds via DMA */
        ATA_FLAG_PIO_LBA48      = (1 << 8), /* Host DMA engine is LBA28 only */