aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-sff.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 12:46:56 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:25 -0400
commit45db2f6c95eee7c6622ea1b3edb9abafba58e3ab (patch)
tree1c57efcf3e118b177dd7c9c1070b8af70694aff3 /drivers/ata/libata-sff.c
parent2a0c15ca39f5881aa1b472ca856bb7a2e584ece7 (diff)
libata: move link onlineness check out of softreset methods
Currently, SATA softresets should do link onlineness check before actually performing SRST protocol but it doesn't really belong to softreset. This patch moves onlineness check in softreset to ata_eh_reset() and ata_eh_followup_srst_needed() to clean up code and help future sata_mv changes which need clear separation between SCR and TF accesses. sata_fsl is peculiar in that its softreset really isn't softreset but combination of hardreset and softreset. This patch adds dummy private ->prereset to keep the current behavior but the driver really should implement separate hard and soft resets and return -EAGAIN from hardreset if it should be follwed by softreset. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-sff.c')
-rw-r--r--drivers/ata/libata-sff.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 8e6c78ac70f..15499522e64 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1889,11 +1889,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes,
1889 1889
1890 DPRINTK("ENTER\n"); 1890 DPRINTK("ENTER\n");
1891 1891
1892 if (ata_link_offline(link)) {
1893 classes[0] = ATA_DEV_NONE;
1894 goto out;
1895 }
1896
1897 /* determine if device 0/1 are present */ 1892 /* determine if device 0/1 are present */
1898 if (ata_devchk(ap, 0)) 1893 if (ata_devchk(ap, 0))
1899 devmask |= (1 << 0); 1894 devmask |= (1 << 0);
@@ -1919,7 +1914,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes,
1919 classes[1] = ata_sff_dev_classify(&link->device[1], 1914 classes[1] = ata_sff_dev_classify(&link->device[1],
1920 devmask & (1 << 1), &err); 1915 devmask & (1 << 1), &err);
1921 1916
1922 out:
1923 DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]); 1917 DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]);
1924 return 0; 1918 return 0;
1925} 1919}