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

Commit 91b1a84c authored by Mark Lord's avatar Mark Lord Committed by Jeff Garzik
Browse files

sata_mv: cleanup chipset GENeration FLAGS 



Clean up the chipset GENeration FLAGS, and rename them
for consistency with other uses of GEN_XX within sata_mv.

Signed-off-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 8e0ee43b

drivers/ata/sata_mv.c

+14 −17
Original line number Original line Diff line number Diff line
@@ -120,14 +120,15 @@ enum { 
	MV_FLAG_IRQ_COALESCE	= (1 << 29),  /* IRQ coalescing capability */

	MV_FLAG_IRQ_COALESCE	= (1 << 29),  /* IRQ coalescing capability */





	MV_COMMON_FLAGS		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

	MV_COMMON_FLAGS		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING,

				  ATA_FLAG_PIO_POLLING,





	MV_6XXX_FLAGS		= MV_FLAG_IRQ_COALESCE,

	MV_GEN_I_FLAGS		= MV_COMMON_FLAGS | ATA_FLAG_NO_ATAPI,





	MV_GENIIE_FLAGS		= MV_COMMON_FLAGS | MV_6XXX_FLAGS |

	MV_GEN_II_FLAGS		= MV_COMMON_FLAGS | MV_FLAG_IRQ_COALESCE |

				  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_NCQ | ATA_FLAG_AN,

				  ATA_FLAG_NCQ | ATA_FLAG_NO_ATAPI,



	MV_GEN_IIE_FLAGS	= MV_GEN_II_FLAGS | ATA_FLAG_AN,





	CRQB_FLAG_READ		= (1 << 0),

	CRQB_FLAG_READ		= (1 << 0),

	CRQB_TAG_SHIFT		= 1,

	CRQB_TAG_SHIFT		= 1,
@@ -603,53 +604,49 @@ static struct ata_port_operations mv_iie_ops = { 




static const struct ata_port_info mv_port_info[] = {

static const struct ata_port_info mv_port_info[] = {

	{  /* chip_504x */

	{  /* chip_504x */

		.flags		= MV_COMMON_FLAGS,

		.flags		= MV_GEN_I_FLAGS,

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

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

		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv5_ops,

		.port_ops	= &mv5_ops,

	},

	},

	{  /* chip_508x */

	{  /* chip_508x */

		.flags		= MV_COMMON_FLAGS | MV_FLAG_DUAL_HC,

		.flags		= MV_GEN_I_FLAGS | MV_FLAG_DUAL_HC,

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

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

		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv5_ops,

		.port_ops	= &mv5_ops,

	},

	},

	{  /* chip_5080 */

	{  /* chip_5080 */

		.flags		= MV_COMMON_FLAGS | MV_FLAG_DUAL_HC,

		.flags		= MV_GEN_I_FLAGS | MV_FLAG_DUAL_HC,

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

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

		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv5_ops,

		.port_ops	= &mv5_ops,

	},

	},

	{  /* chip_604x */

	{  /* chip_604x */

		.flags		= MV_COMMON_FLAGS | MV_6XXX_FLAGS |

		.flags		= MV_GEN_II_FLAGS,

				  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_NCQ,

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

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

		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv6_ops,

		.port_ops	= &mv6_ops,

	},

	},

	{  /* chip_608x */

	{  /* chip_608x */

		.flags		= MV_COMMON_FLAGS | MV_6XXX_FLAGS |

		.flags		= MV_GEN_II_FLAGS | MV_FLAG_DUAL_HC,

				  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_NCQ | MV_FLAG_DUAL_HC,

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

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

		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv6_ops,

		.port_ops	= &mv6_ops,

	},

	},

	{  /* chip_6042 */

	{  /* chip_6042 */

		.flags		= MV_GENIIE_FLAGS,

		.flags		= MV_GEN_IIE_FLAGS,

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

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

		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv_iie_ops,

		.port_ops	= &mv_iie_ops,

	},

	},

	{  /* chip_7042 */

	{  /* chip_7042 */

		.flags		= MV_GENIIE_FLAGS,

		.flags		= MV_GEN_IIE_FLAGS,

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

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

		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv_iie_ops,

		.port_ops	= &mv_iie_ops,

	},

	},

	{  /* chip_soc */

	{  /* chip_soc */

		.flags		= MV_GENIIE_FLAGS,

		.flags		= MV_GEN_IIE_FLAGS,

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

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

		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv_iie_ops,

		.port_ops	= &mv_iie_ops,