26 files changed, 30 insertions, 44 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index b8d96ce37fc9..3a0435181f77 100644
--- 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 3e606c34f57b..9a323417907e 100644
--- 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 8b5ea399a4f4..a791b8ce6294 100644
--- 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 66ce6a526f27..36f189c7ee8c 100644
--- 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 7aed5c792597..1086cacf3cf5 100644
--- 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 ba54b089f98c..783ec4fc1119 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)
 
         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 75b49d01780b..7f7b883c008e 100644
--- 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 fa1b95a9a7ff..18703e2e51c6 100644
--- 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 11fb4ccc74b4..462a5fcebab9 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)
         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 b18351122525..57ef92ce1a5c 100644
--- 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 1898c6ed4b4e..b4ede40f8ae1 100644
--- 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 0ffd631000b7..0365a5d714f6 100644
--- 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 8a51d673e5b2..c446ae6055a3 100644
--- 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 093715c3273a..5eb050086f38 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 = {
 
 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 adbe0426c8f0..384f202fbdec 100644
--- 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 843af13606e1..8c37b0e7fad8 100644
--- 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 b0214d00d50b..1d70cf714275 100644
--- 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 bf74a36d3cc3..a2193fc52763 100644
--- 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 7254e255fd78..cca96e89339d 100644
--- 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 f03ad48273ff..b0cba3cd9361 100644
--- 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 daeebf19a6a9..5e30a7994391 100644
--- 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 3a4f84219719..0742d3d968e0 100644
--- 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 af41c6fd1254..1ad7b94f0b38 100644
--- 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 7d9db4aaf07e..adc913a35189 100644
--- 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 76384d077b2d..d58e656bef70 100644
--- 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 e079cf29ed5d..192bdc7d8f6e 100644
--- 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,