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

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

sata_mv: group genIIe flags 



Group all of the flags for GenIIe devices into a common definition,
to ensure that any updates to them are shared by all GenIIe devices.

This will help make future maintenance somewhat simpler.

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

drivers/ata/sata_mv.c

+8 −9
Original line number Diff line number Diff line
@@ -128,8 +128,13 @@ enum { 
	MV_COMMON_FLAGS		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI |

				  ATA_FLAG_PIO_POLLING,



	MV_6XXX_FLAGS		= MV_FLAG_IRQ_COALESCE,



	MV_GENIIE_FLAGS		= MV_COMMON_FLAGS | MV_6XXX_FLAGS |

				  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_NCQ,



	CRQB_FLAG_READ		= (1 << 0),

	CRQB_TAG_SHIFT		= 1,

	CRQB_IOID_SHIFT		= 6,	/* CRQB Gen-II/IIE IO Id shift */
@@ -640,25 +645,19 @@ static const struct ata_port_info mv_port_info[] = { 
		.port_ops	= &mv6_ops,

	},

	{  /* chip_6042 */

		.flags		= MV_COMMON_FLAGS | MV_6XXX_FLAGS |

				  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_NCQ,

		.flags		= MV_GENIIE_FLAGS,

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

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv_iie_ops,

	},

	{  /* chip_7042 */

		.flags		= MV_COMMON_FLAGS | MV_6XXX_FLAGS |

				  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_NCQ,

		.flags		= MV_GENIIE_FLAGS,

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

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv_iie_ops,

	},

	{  /* chip_soc */

		.flags		= MV_COMMON_FLAGS | MV_6XXX_FLAGS |

				  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_NCQ | MV_FLAG_SOC,

		.flags		= MV_GENIIE_FLAGS | MV_FLAG_SOC,

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

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &mv_iie_ops,