ata_piix: separate controller IDs into separate enum
PATCH 1/1 ata_piix: separate controller IDs into separate enum
Separate controller IDs into a separate enum as Jeff requested.
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/ata_piix.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/ata/ata_piix.c +17 -15
@@ -118,21 +118,6 @@ enum {PIIX_80C_PRI = (1 <<5 ) | (1 <<4 ),PIIX_80C_SEC = (1 <<7 ) | (1 <<6 ), -/* controller IDs */ - piix_pata_mwdma =0 ,/* 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 */ - ich_pata_100,/* ICH up to UDMA 100 */ - ich5_sata, - ich6_sata, - ich6_sata_ahci, - ich6m_sata_ahci, - ich8_sata_ahci, - ich8_2port_sata, - ich8m_apple_sata_ahci,/* locks up on second port enable */ - tolapai_sata_ahci, -/* constants for mapping table */ P0 =0 ,/* port 0 */ P1 = 1, /* port 1 */
@@ -148,6 +133,23 @@ enum { PIIX_HOST_BROKEN_SUSPEND = (1 << 24), }; +enum piix_controller_ids { +/* controller IDs */ + 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 */ + ich_pata_100,/* ICH up to UDMA 100 */ + ich5_sata, + ich6_sata, + ich6_sata_ahci, + ich6m_sata_ahci, + ich8_sata_ahci, + ich8_2port_sata, + ich8m_apple_sata_ahci,/* locks up on second port enable */ + tolapai_sata_ahci, +}; +struct piix_map_db {const u32 mask;const u16 port_enable;
Jeff Garzik
AppliedQuoted 6 lines · Tejun Heo
Separate controller IDs into a separate enum as Jeff requested.
Signed-off-by Tejun Heo <[email protected]>--- drivers/ata/ata_piix.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
applied