mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
[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>
This commit is contained in:
parent
e1fd263c77
commit
219e621443
@ -101,7 +101,7 @@ enum {
|
||||
ICH5_PCS = 0x92, /* port control and status */
|
||||
PIIX_SCC = 0x0A, /* sub-class code register */
|
||||
|
||||
PIIX_FLAG_IGN_PRESENT = (1 << 25), /* ignore PCS present bits */
|
||||
PIIX_FLAG_IGNORE_PCS = (1 << 25), /* ignore PCS present bits */
|
||||
PIIX_FLAG_SCR = (1 << 26), /* SCR available */
|
||||
PIIX_FLAG_AHCI = (1 << 27), /* AHCI possible */
|
||||
PIIX_FLAG_CHECKINTR = (1 << 28), /* make sure PCI INTx enabled */
|
||||
@ -365,7 +365,7 @@ static struct ata_port_info piix_port_info[] = {
|
||||
{
|
||||
.sht = &piix_sht,
|
||||
.host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED |
|
||||
PIIX_FLAG_CHECKINTR | PIIX_FLAG_IGN_PRESENT,
|
||||
PIIX_FLAG_CHECKINTR | PIIX_FLAG_IGNORE_PCS,
|
||||
.pio_mask = 0x1f, /* pio0-4 */
|
||||
.mwdma_mask = 0x07, /* mwdma0-2 */
|
||||
.udma_mask = 0x7f, /* udma0-6 */
|
||||
@ -538,7 +538,7 @@ static unsigned int piix_sata_probe (struct ata_port *ap)
|
||||
port = map[base + i];
|
||||
if (port < 0)
|
||||
continue;
|
||||
if (ap->flags & PIIX_FLAG_IGN_PRESENT || pcs & 1 << (4 + port))
|
||||
if (ap->flags & PIIX_FLAG_IGNORE_PCS || pcs & 1 << (4 + port))
|
||||
present_mask |= 1 << i;
|
||||
else
|
||||
pcs &= ~(1 << port);
|
||||
|
Loading…
Reference in New Issue
Block a user