aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/ahci.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 09:47:20 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:23 -0400
commit305d2a1ab137d11d573319c315748a87060fe82d (patch)
tree8dcf81b1742db21c6a745688de96a18944c83617 /drivers/ata/ahci.c
parent5958e3025fd9d97429163e074d9cfa3848f51f28 (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/ahci.c')
-rw-r--r--drivers/ata/ahci.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index a69bcca4eb1b..3071a2341be3 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1365,7 +1365,6 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class,
1365 1365
1366 ahci_start_engine(ap); 1366 ahci_start_engine(ap);
1367 1367
1368 *class = ATA_DEV_NONE;
1369 if (online) 1368 if (online)
1370 *class = ahci_dev_classify(ap); 1369 *class = ahci_dev_classify(ap);
1371 1370
@@ -1394,7 +1393,6 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class,
1394 /* vt8251 doesn't clear BSY on signature FIS reception, 1393 /* vt8251 doesn't clear BSY on signature FIS reception,
1395 * request follow-up softreset. 1394 * request follow-up softreset.
1396 */ 1395 */
1397 *class = ATA_DEV_NONE;
1398 return online ? -EAGAIN : rc; 1396 return online ? -EAGAIN : rc;
1399} 1397}
1400 1398
@@ -1439,7 +1437,6 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class,
1439 if (rc) 1437 if (rc)
1440 ahci_kick_engine(ap, 0); 1438 ahci_kick_engine(ap, 0);
1441 } 1439 }
1442 *class = ATA_DEV_NONE;
1443 return rc; 1440 return rc;
1444} 1441}
1445 1442