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

Commit 469248ab authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] Clean up driver udma_mask initializers 



* Use ATA_UDMA*
* Remove FIXME notations that once served to remind us to verify
  that these were indeed the correct UDMA masks.  They are.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d26fc955

drivers/ata/ahci.c

+5 −5
Original line number Diff line number Diff line
@@ -330,14 +330,14 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_pi */

	{

		.flags		= AHCI_FLAG_COMMON | AHCI_FLAG_HONOR_PI,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_vt8251 */
@@ -345,14 +345,14 @@ static const struct ata_port_info ahci_port_info[] = { 
		.flags		= AHCI_FLAG_COMMON | ATA_FLAG_HRST_TO_RESUME |

				  AHCI_FLAG_NO_NCQ,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_vt8251_ops,

	},

	/* board_ahci_ign_iferr */

	{

		.flags		= AHCI_FLAG_COMMON | AHCI_FLAG_IGN_IRQ_IF_ERR,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_sb600 */
@@ -361,7 +361,7 @@ static const struct ata_port_info ahci_port_info[] = { 
				  AHCI_FLAG_IGN_SERR_INTERNAL |

				  AHCI_FLAG_32BIT_ONLY,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

};

drivers/ata/sata_promise.c

+7 −7
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static const struct ata_port_info pdc_port_info[] = { 
				  PDC_FLAG_SATA_PATA,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &pdc_old_sata_ops,

	},
@@ -259,7 +259,7 @@ static const struct ata_port_info pdc_port_info[] = { 
		.flags		= PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &pdc_pata_ops,

	},
@@ -269,7 +269,7 @@ static const struct ata_port_info pdc_port_info[] = { 
				  PDC_FLAG_4_PORTS,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &pdc_old_sata_ops,

	},
@@ -279,7 +279,7 @@ static const struct ata_port_info pdc_port_info[] = { 
				  PDC_FLAG_4_PORTS,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &pdc_pata_ops,

	},
@@ -289,7 +289,7 @@ static const struct ata_port_info pdc_port_info[] = { 
				  PDC_FLAG_GEN_II | PDC_FLAG_SATA_PATA,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &pdc_sata_ops,

	},
@@ -299,7 +299,7 @@ static const struct ata_port_info pdc_port_info[] = { 
				  PDC_FLAG_GEN_II,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &pdc_pata_ops,

	},
@@ -309,7 +309,7 @@ static const struct ata_port_info pdc_port_info[] = { 
				  PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &pdc_sata_ops,

	},

};

drivers/ata/sata_sx4.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static const struct ata_port_info pdc_port_info[] = { 
				  ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &pdc_20621_ops,

	},