Commit 9cde9ed1 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

ata_piix: separate controller IDs into separate enum 



Separate controller IDs into a separate enum as Jeff requested.

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

drivers/ata/ata_piix.c

+18 −16
Original line number Diff line number Diff line
@@ -118,8 +118,24 @@ enum { 
	PIIX_80C_PRI		= (1 << 5) | (1 << 4),

	PIIX_80C_SEC		= (1 << 7) | (1 << 6),



	/* constants for mapping table */

	P0			= 0,  /* port 0 */

	P1			= 1,  /* port 1 */

	P2			= 2,  /* port 2 */

	P3			= 3,  /* port 3 */

	IDE			= -1, /* IDE */

	NA			= -2, /* not avaliable */

	RV			= -3, /* reserved */



	PIIX_AHCI_DEVICE	= 6,



	/* host->flags bits */

	PIIX_HOST_BROKEN_SUSPEND = (1 << 24),

};



enum piix_controller_ids {

	/* controller IDs */

	piix_pata_mwdma		= 0,	/* PIIX3 MWDMA only */

	piix_pata_mwdma,	/* PIIX3 MWDMA only */

	piix_pata_33,		/* PIIX4 at 33Mhz */

	ich_pata_33,		/* ICH up to UDMA 33 only */

	ich_pata_66,		/* ICH up to 66 Mhz */
@@ -133,20 +149,6 @@ enum { 
	ich8m_apple_sata_ahci,	/* locks up on second port enable */

	tolapai_sata_ahci,

	piix_pata_vmw,			/* PIIX4 for VMware, spurious DMA_ERR */



	/* constants for mapping table */

	P0			= 0,  /* port 0 */

	P1			= 1,  /* port 1 */

	P2			= 2,  /* port 2 */

	P3			= 3,  /* port 3 */

	IDE			= -1, /* IDE */

	NA			= -2, /* not avaliable */

	RV			= -3, /* reserved */



	PIIX_AHCI_DEVICE	= 6,



	/* host->flags bits */

	PIIX_HOST_BROKEN_SUSPEND = (1 << 24),

};



struct piix_map_db {