From 51c1fdd71894a02c99050dbf29edbaabb2337900 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 21 May 2007 18:33:47 +0200 Subject: [PATCH] --- yaml --- r: 58691 b: refs/heads/master c: a16abc0b5ff3ef655e40cb5e6671d57f5dde513d h: refs/heads/master i: 58689: 419760651c220f37d4a43beb360803912af82119 58687: 94ad6519301509c7a12e15b3075228ef95c5a6e9 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8e90e8e794be..73eddb91d6ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ca972c2028edd6cd6a6ca40bd1f58b91fb4ea58 +refs/heads/master: a16abc0b5ff3ef655e40cb5e6671d57f5dde513d diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 90ed2b9a34de..74c4cd9ad82b 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -3355,7 +3355,7 @@ int ata_std_prereset(struct ata_port *ap, unsigned long deadline) return 0; /* if SATA, resume phy */ - if (ap->cbl == ATA_CBL_SATA) { + if (ap->flags & ATA_FLAG_SATA) { rc = sata_phy_resume(ap, timing, deadline); /* whine about phy resume failure but proceed */ if (rc && rc != -EOPNOTSUPP) @@ -5656,7 +5656,7 @@ irqreturn_t ata_interrupt (int irq, void *dev_instance) */ int sata_scr_valid(struct ata_port *ap) { - return ap->cbl == ATA_CBL_SATA && ap->ops->scr_read; + return (ap->flags & ATA_FLAG_SATA) && ap->ops->scr_read; } /** @@ -6323,7 +6323,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) if (!ata_port_is_dummy(ap)) ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%p " "ctl 0x%p bmdma 0x%p irq %d\n", - ap->cbl == ATA_CBL_SATA ? 'S' : 'P', + (ap->flags & ATA_FLAG_SATA) ? 'S' : 'P', ata_mode_string(xfer_mask), ap->ioaddr.cmd_addr, ap->ioaddr.ctl_addr,