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

Commit 1c24a412 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata ata_piix] cleanup: remove duplicate ata_port_info records

parent e74ac799

drivers/scsi/ata_piix.c

+7 −33
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ enum { 
	ich5_sata		= 1,

	piix4_pata		= 2,

	ich6_sata		= 3,

	ich6_sata_rm		= 4,

	ich7_sata		= 5,

	esb2_sata		= 6,

	ich6_sata_ahci		= 4,



	PIIX_AHCI_DEVICE	= 6,

};
@@ -111,11 +109,11 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },

	{ 0x8086, 0x25b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },

	{ 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },

	{ 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm },

	{ 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm },

	{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },

	{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },

	{ 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, esb2_sata },

	{ 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },



	{ }	/* terminate list */

};
@@ -258,31 +256,7 @@ static struct ata_port_info piix_port_info[] = { 
		.port_ops	= &piix_sata_ops,

	},



	/* ich6_sata_rm */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |

				  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |

				  ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI,

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

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

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

		.port_ops	= &piix_sata_ops,

	},



	/* ich7_sata */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |

				  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |

				  ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI,

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

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

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

		.port_ops	= &piix_sata_ops,

	},



	/* esb2_sata */

	/* ich6_sata_ahci */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |