diff options
| author | Tejun Heo | 2008-05-18 18:15:07 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2008-05-19 23:51:47 +0200 |
| commit | dc98c32cbe80750ae2d9d9fbdae305d38f005de7 (patch) | |
| tree | 52bff671e5ed5b39056bb4a5c531476c83e9f708 /drivers/ata/libata-pmp.c | |
| parent | libata: reorganize ata_eh_reset() no reset method path (diff) | |
| download | kernel-qcow2-linux-dc98c32cbe80750ae2d9d9fbdae305d38f005de7.tar.gz kernel-qcow2-linux-dc98c32cbe80750ae2d9d9fbdae305d38f005de7.tar.xz kernel-qcow2-linux-dc98c32cbe80750ae2d9d9fbdae305d38f005de7.zip | |
libata: move reset freeze/thaw handling into ata_eh_reset()
Previously reset freeze/thaw handling lived outside of ata_eh_reset()
mainly because the original PMP reset code needed the port frozen
while resetting all the fan-out ports, which is no longer the case.
This patch moves freeze/thaw handling into ata_eh_reset().
@prereset() and @postreset() are now called w/o freezing the port
although @prereset() an be called frozen if the port is frozen prior
to entering ata_eh_reset().
This makes code simpler and will help removing hotplug event related
races.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-pmp.c')
| -rw-r--r-- | drivers/ata/libata-pmp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c index ff1822a7da38..f3ad024394c2 100644 --- a/drivers/ata/libata-pmp.c +++ b/drivers/ata/libata-pmp.c @@ -700,8 +700,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, if (ehc->i.action & ATA_EH_RESET) { struct ata_link *tlink; - ata_eh_freeze_port(ap); - /* reset */ rc = ata_eh_reset(link, 0, prereset, softreset, hardreset, postreset); @@ -711,8 +709,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, goto fail; } - ata_eh_thaw_port(ap); - /* PMP is reset, SErrors cannot be trusted, scan all */ ata_port_for_each_link(tlink, ap) { struct ata_eh_context *ehc = &tlink->eh_context; |