diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-07-11 13:11:17 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-16 11:48:28 -0400 |
commit | 73291a1cb68bb62be62a927a9d67fe417b3cfe35 (patch) | |
tree | 543d6a1beede76124926eaf5afebdc634c6e45de | |
parent | 08f12edc335d24a89ba2f50b0a5b9d12295ce198 (diff) |
[libata] ata_piix: minor cleanups noticed in prior patch run
* delete unused PIIX_FLAG_COMBINED*
* port_enable should be u16 rather than u32
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/scsi/ata_piix.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c index a960bb71c545..474965a8c68a 100644 --- a/drivers/scsi/ata_piix.c +++ b/drivers/scsi/ata_piix.c | |||
@@ -105,9 +105,6 @@ enum { | |||
105 | PIIX_FLAG_SCR = (1 << 26), /* SCR available */ | 105 | PIIX_FLAG_SCR = (1 << 26), /* SCR available */ |
106 | PIIX_FLAG_AHCI = (1 << 27), /* AHCI possible */ | 106 | PIIX_FLAG_AHCI = (1 << 27), /* AHCI possible */ |
107 | PIIX_FLAG_CHECKINTR = (1 << 28), /* make sure PCI INTx enabled */ | 107 | PIIX_FLAG_CHECKINTR = (1 << 28), /* make sure PCI INTx enabled */ |
108 | PIIX_FLAG_COMBINED = (1 << 29), /* combined mode possible */ | ||
109 | /* ICH6/7 use different scheme for map value */ | ||
110 | PIIX_FLAG_COMBINED_ICH6 = PIIX_FLAG_COMBINED | (1 << 30), | ||
111 | 108 | ||
112 | /* combined mode. if set, PATA is channel 0. | 109 | /* combined mode. if set, PATA is channel 0. |
113 | * if clear, PATA is channel 1. | 110 | * if clear, PATA is channel 1. |
@@ -142,7 +139,7 @@ enum { | |||
142 | 139 | ||
143 | struct piix_map_db { | 140 | struct piix_map_db { |
144 | const u32 mask; | 141 | const u32 mask; |
145 | const u32 port_enable; | 142 | const u16 port_enable; |
146 | const int present_shift; | 143 | const int present_shift; |
147 | const int map[][4]; | 144 | const int map[][4]; |
148 | }; | 145 | }; |
@@ -393,8 +390,7 @@ static struct ata_port_info piix_port_info[] = { | |||
393 | /* ich5_sata */ | 390 | /* ich5_sata */ |
394 | { | 391 | { |
395 | .sht = &piix_sht, | 392 | .sht = &piix_sht, |
396 | .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED | | 393 | .host_flags = ATA_FLAG_SATA | PIIX_FLAG_CHECKINTR, |
397 | PIIX_FLAG_CHECKINTR, | ||
398 | .pio_mask = 0x1f, /* pio0-4 */ | 394 | .pio_mask = 0x1f, /* pio0-4 */ |
399 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 395 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
400 | .udma_mask = 0x7f, /* udma0-6 */ | 396 | .udma_mask = 0x7f, /* udma0-6 */ |
@@ -404,7 +400,7 @@ static struct ata_port_info piix_port_info[] = { | |||
404 | /* i6300esb_sata */ | 400 | /* i6300esb_sata */ |
405 | { | 401 | { |
406 | .sht = &piix_sht, | 402 | .sht = &piix_sht, |
407 | .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED | | 403 | .host_flags = ATA_FLAG_SATA | |
408 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_IGNORE_PCS, | 404 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_IGNORE_PCS, |
409 | .pio_mask = 0x1f, /* pio0-4 */ | 405 | .pio_mask = 0x1f, /* pio0-4 */ |
410 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 406 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
@@ -415,7 +411,7 @@ static struct ata_port_info piix_port_info[] = { | |||
415 | /* ich6_sata */ | 411 | /* ich6_sata */ |
416 | { | 412 | { |
417 | .sht = &piix_sht, | 413 | .sht = &piix_sht, |
418 | .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 | | 414 | .host_flags = ATA_FLAG_SATA | |
419 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR, | 415 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR, |
420 | .pio_mask = 0x1f, /* pio0-4 */ | 416 | .pio_mask = 0x1f, /* pio0-4 */ |
421 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 417 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
@@ -426,7 +422,7 @@ static struct ata_port_info piix_port_info[] = { | |||
426 | /* ich6_sata_ahci */ | 422 | /* ich6_sata_ahci */ |
427 | { | 423 | { |
428 | .sht = &piix_sht, | 424 | .sht = &piix_sht, |
429 | .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 | | 425 | .host_flags = ATA_FLAG_SATA | |
430 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR | | 426 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR | |
431 | PIIX_FLAG_AHCI, | 427 | PIIX_FLAG_AHCI, |
432 | .pio_mask = 0x1f, /* pio0-4 */ | 428 | .pio_mask = 0x1f, /* pio0-4 */ |
@@ -438,7 +434,7 @@ static struct ata_port_info piix_port_info[] = { | |||
438 | /* ich6m_sata_ahci */ | 434 | /* ich6m_sata_ahci */ |
439 | { | 435 | { |
440 | .sht = &piix_sht, | 436 | .sht = &piix_sht, |
441 | .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 | | 437 | .host_flags = ATA_FLAG_SATA | |
442 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR | | 438 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR | |
443 | PIIX_FLAG_AHCI, | 439 | PIIX_FLAG_AHCI, |
444 | .pio_mask = 0x1f, /* pio0-4 */ | 440 | .pio_mask = 0x1f, /* pio0-4 */ |
@@ -450,7 +446,7 @@ static struct ata_port_info piix_port_info[] = { | |||
450 | /* ich8_sata_ahci */ | 446 | /* ich8_sata_ahci */ |
451 | { | 447 | { |
452 | .sht = &piix_sht, | 448 | .sht = &piix_sht, |
453 | .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 | | 449 | .host_flags = ATA_FLAG_SATA | |
454 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR | | 450 | PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR | |
455 | PIIX_FLAG_AHCI, | 451 | PIIX_FLAG_AHCI, |
456 | .pio_mask = 0x1f, /* pio0-4 */ | 452 | .pio_mask = 0x1f, /* pio0-4 */ |