diff options
| author | Tejun Heo <htejun@gmail.com> | 2008-04-07 22:47:20 +0900 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:23 -0400 |
| commit | 5958e3025fd9d97429163e074d9cfa3848f51f28 (patch) | |
| tree | f20492dc35fc2651452c871fbc812bd4f8379b40 /drivers/ata/sata_sil24.c | |
| parent | ac371987a81c61c2efbd6931245cdcaf43baad89 (diff) | |
| download | linux-3.10-5958e3025fd9d97429163e074d9cfa3848f51f28.tar.gz linux-3.10-5958e3025fd9d97429163e074d9cfa3848f51f28.tar.bz2 linux-3.10-5958e3025fd9d97429163e074d9cfa3848f51f28.zip | |
libata: move PMP SCR access failure during reset to ata_eh_reset()
If PMP fan-out reset fails and SCR isn't accessible, PMP should be
reset. This used to be tested by sata_pmp_std_hardreset() and
communicated to EH by -ERESTART. However, this logic is generic and
doesn't really have much to do with specific hardreset implementation.
This patch moves SCR access failure detection logic to ata_eh_reset()
where it belongs. As this makes sata_pmp_std_hardreset() identical to
sata_std_hardreset(), the function is killed and replaced with the
standard method.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/sata_sil24.c')
| -rw-r--r-- | drivers/ata/sata_sil24.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index b83851f6e06..fc9d48cd812 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -944,7 +944,7 @@ static int sil24_pmp_hardreset(struct ata_link *link, unsigned int *class, return rc; } - return sata_pmp_std_hardreset(link, class, deadline); + return sata_std_hardreset(link, class, deadline); } static void sil24_freeze(struct ata_port *ap) |