diff options
| author | Tejun Heo <htejun@gmail.com> | 2008-04-07 22:47:19 +0900 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:22 -0400 |
| commit | 9dadd45b24145d6aee2fabb28d7aef972301892b (patch) | |
| tree | c97c323e2edd400bc94eaceddf20f84e9a6da005 /drivers/ata/libata-pmp.c | |
| parent | a89611e8489ac24f371c9fd6fef6605b170b16ba (diff) | |
| download | blackbird-op-linux-9dadd45b24145d6aee2fabb28d7aef972301892b.tar.gz blackbird-op-linux-9dadd45b24145d6aee2fabb28d7aef972301892b.zip | |
libata: move generic hardreset code from sata_sff_hardreset() to sata_link_hardreset()
sata_sff_hardreset() contains link readiness wait logic which isn't
SFF specific. Move that part into sata_link_hardreset(), which now
takes two more parameters - @online and @check_ready. Both are
optional. The former is out parameter for link onlineness after
reset. The latter is used to wait for link readiness after hardreset.
Users of sata_link_hardreset() is updated to use new funtionality and
ahci_hardreset() is updated to use sata_link_hardreset() instead of
sata_sff_hardreset(). This doesn't really cause any behavior change.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/libata-pmp.c')
| -rw-r--r-- | drivers/ata/libata-pmp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c index a7cb1498c9b2..7f1a87f01ab2 100644 --- a/drivers/ata/libata-pmp.c +++ b/drivers/ata/libata-pmp.c @@ -239,13 +239,14 @@ int sata_pmp_std_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline) { const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context); + bool online; u32 tmp; int rc; DPRINTK("ENTER\n"); /* do hardreset */ - rc = sata_link_hardreset(link, timing, deadline); + rc = sata_link_hardreset(link, timing, deadline, &online, NULL); if (rc) { ata_link_printk(link, KERN_ERR, "COMRESET failed (errno=%d)\n", rc); @@ -261,7 +262,7 @@ int sata_pmp_std_hardreset(struct ata_link *link, unsigned int *class, } /* if device is present, follow up with srst to wait for !BSY */ - if (ata_link_online(link)) + if (online) rc = -EAGAIN; out: /* if SCR isn't accessible, we need to reset the PMP */ @@ -916,7 +917,7 @@ static int sata_pmp_eh_handle_disabled_links(struct ata_port *ap) * SError.N working. */ sata_link_hardreset(link, sata_deb_timing_normal, - jiffies + ATA_TMOUT_INTERNAL_QUICK); + jiffies + ATA_TMOUT_INTERNAL_QUICK, NULL, NULL); /* unconditionally clear SError.N */ rc = sata_scr_write(link, SCR_ERROR, SERR_PHYRDY_CHG); |
