diff options
author | Tejun Heo <htejun@gmail.com> | 2008-04-07 09:47:20 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:23 -0400 |
commit | 305d2a1ab137d11d573319c315748a87060fe82d (patch) | |
tree | 8dcf81b1742db21c6a745688de96a18944c83617 /drivers/ata/libata-sff.c | |
parent | 5958e3025fd9d97429163e074d9cfa3848f51f28 (diff) |
libata: unify mechanism to request follow-up SRST
Previously, there were two ways to trigger follow-up SRST from
hardreset method - returning -EAGAIN and leaving all device classes
unmodified. Drivers never used the latter mechanism and the only use
case for the former was when hardreset couldn't classify.
Drop the latter mechanism and let -EAGAIN mean "perform follow-up SRST
if classification is required". This change removes unnecessary
follow-up SRSTs and simplifies reset implementations.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/libata-sff.c')
-rw-r--r-- | drivers/ata/libata-sff.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index f464ca1fa26..5be8a6058da 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -1929,7 +1929,6 @@ int sata_sff_hardreset(struct ata_link *link, unsigned int *class, | |||
1929 | 1929 | ||
1930 | rc = sata_link_hardreset(link, timing, deadline, &online, | 1930 | rc = sata_link_hardreset(link, timing, deadline, &online, |
1931 | ata_sff_check_ready); | 1931 | ata_sff_check_ready); |
1932 | *class = ATA_DEV_NONE; | ||
1933 | if (online) | 1932 | if (online) |
1934 | *class = ata_sff_dev_classify(link->device, 1, NULL); | 1933 | *class = ata_sff_dev_classify(link->device, 1, NULL); |
1935 | 1934 | ||