aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-03-05 00:28:51 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-05 00:36:28 -0500
commit219e621443a1d0bba2a6d15cbc9a1181892c6d79 (patch)
tree2fdfdc3f463f356b651d9bee9599640b2ce52be3 /drivers/scsi
parente1fd263c772e89706dee28aa794399ac4bd6b9c1 (diff)
[PATCH] ata_piix: rename PIIX_FLAG_IGN_PRESENT to PIIX_FLAG_IGNORE_PCS
Rename PIIX_FLAG_IGN_PRESENT to PIIX_FLAG_IGNORE_PCS as Jeff requested. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ata_piix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 72e38e6ea756..9327b62f97de 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -101,7 +101,7 @@ enum {
101 ICH5_PCS = 0x92, /* port control and status */ 101 ICH5_PCS = 0x92, /* port control and status */
102 PIIX_SCC = 0x0A, /* sub-class code register */ 102 PIIX_SCC = 0x0A, /* sub-class code register */
103 103
104 PIIX_FLAG_IGN_PRESENT = (1 << 25), /* ignore PCS present bits */ 104 PIIX_FLAG_IGNORE_PCS = (1 << 25), /* ignore PCS present bits */
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 */
@@ -365,7 +365,7 @@ static struct ata_port_info piix_port_info[] = {
365 { 365 {
366 .sht = &piix_sht, 366 .sht = &piix_sht,
367 .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED | 367 .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED |
368 PIIX_FLAG_CHECKINTR | PIIX_FLAG_IGN_PRESENT, 368 PIIX_FLAG_CHECKINTR | PIIX_FLAG_IGNORE_PCS,
369 .pio_mask = 0x1f, /* pio0-4 */ 369 .pio_mask = 0x1f, /* pio0-4 */
370 .mwdma_mask = 0x07, /* mwdma0-2 */ 370 .mwdma_mask = 0x07, /* mwdma0-2 */
371 .udma_mask = 0x7f, /* udma0-6 */ 371 .udma_mask = 0x7f, /* udma0-6 */
@@ -538,7 +538,7 @@ static unsigned int piix_sata_probe (struct ata_port *ap)
538 port = map[base + i]; 538 port = map[base + i];
539 if (port < 0) 539 if (port < 0)
540 continue; 540 continue;
541 if (ap->flags & PIIX_FLAG_IGN_PRESENT || pcs & 1 << (4 + port)) 541 if (ap->flags & PIIX_FLAG_IGNORE_PCS || pcs & 1 << (4 + port))
542 present_mask |= 1 << i; 542 present_mask |= 1 << i;
543 else 543 else
544 pcs &= ~(1 << port); 544 pcs &= ~(1 << port);