Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3696df30 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Jeff Garzik
Browse files

libata: remove ATA_FLAG_MMIO 



Commit 0d5ff566 (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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c10f97b9

drivers/ata/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/ata/ahci.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/ata/libata-acpi.c

+1 −2
Original line number Diff line number Diff line
@@ -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.

drivers/ata/pata_at32.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/ata/pata_bf54x.c

+0 −1
Original line number Diff line number Diff line
@@ -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,