Commit 1188c0d8 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

ahci: consolidate common port flags 



Consolidate common port flags into AHCI_FLAG_COMMON.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4f701d1e

drivers/ata/ahci.c

+10 −19
Original line number Diff line number Diff line
@@ -170,6 +170,10 @@ enum { 
	AHCI_FLAG_IGN_IRQ_IF_ERR	= (1 << 25), /* ignore IRQ_IF_ERR */

	AHCI_FLAG_HONOR_PI		= (1 << 26), /* honor PORTS_IMPL */

	AHCI_FLAG_IGN_SERR_INTERNAL	= (1 << 27), /* ignore SERR_INTERNAL */



	AHCI_FLAG_COMMON		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

					  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

					  ATA_FLAG_SKIP_D2H_BSY,

};



struct ahci_cmd_hdr {
@@ -323,54 +327,41 @@ static const struct ata_port_operations ahci_vt8251_ops = { 
static const struct ata_port_info ahci_port_info[] = {

	/* board_ahci */

	{

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY,

		.flags		= AHCI_FLAG_COMMON,

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

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

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_pi */

	{

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY | AHCI_FLAG_HONOR_PI,

		.flags		= AHCI_FLAG_COMMON | AHCI_FLAG_HONOR_PI,

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

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

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_vt8251 */

	{

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY |

				  ATA_FLAG_HRST_TO_RESUME | AHCI_FLAG_NO_NCQ,

		.flags		= AHCI_FLAG_COMMON | ATA_FLAG_HRST_TO_RESUME |

				  AHCI_FLAG_NO_NCQ,

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

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

		.port_ops	= &ahci_vt8251_ops,

	},

	/* board_ahci_ign_iferr */

	{

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY |

				  AHCI_FLAG_IGN_IRQ_IF_ERR,

		.flags		= AHCI_FLAG_COMMON | AHCI_FLAG_IGN_IRQ_IF_ERR,

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

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

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_sb600 */

	{

		.sht		= &ahci_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY |

		.flags		= AHCI_FLAG_COMMON |

				  AHCI_FLAG_IGN_SERR_INTERNAL,

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

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

		.port_ops	= &ahci_ops,

	},



};



static const struct pci_device_id ahci_pci_tbl[] = {