hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tejun Heo 2007-05-21 18:33:47 +02:00 committed by Jeff Garzik
parent 1ca972c202
commit a16abc0b5f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ata/libata-core.c
View File

@ -3355,7 +3355,7 @@ int ata_std_prereset(struct ata_port *ap, unsigned long deadline)
return 0; return 0;
/* if SATA, resume phy */ /* if SATA, resume phy */
if (ap->cbl == ATA_CBL_SATA) { if (ap->flags & ATA_FLAG_SATA) {
rc = sata_phy_resume(ap, timing, deadline); rc = sata_phy_resume(ap, timing, deadline);
/* whine about phy resume failure but proceed */ /* whine about phy resume failure but proceed */
if (rc && rc != -EOPNOTSUPP) 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) 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)) if (!ata_port_is_dummy(ap))
ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%p " ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%p "
"ctl 0x%p bmdma 0x%p irq %d\n", "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), ata_mode_string(xfer_mask),
ap->ioaddr.cmd_addr, ap->ioaddr.cmd_addr,
ap->ioaddr.ctl_addr, ap->ioaddr.ctl_addr,