libata: replace ap->cbl tests with ATA_FLAG_SATA tests

ap->cbl == ATA_CBL_SATA indicates SATA cable while ap->flags &
ATA_FLAG_SATA indicates SATA host port.  Till now they always gave the
same result but SATA/PATA bridge handling will change that.  Switch to
ATA_FLAG_SATA test if we're testing for host port type.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 90ed2b9a34de5ff546d3786729d414a6ac3460da..74c4cd9ad82b0eca7ecee112d6f3ca0a8cdd35a7 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/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,