aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/libata.h
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
commit5958e3025fd9d97429163e074d9cfa3848f51f28 (patch)
treef20492dc35fc2651452c871fbc812bd4f8379b40 /include/linux/libata.h
parentac371987a81c61c2efbd6931245cdcaf43baad89 (diff)
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 'include/linux/libata.h')
-rw-r--r--include/linux/libata.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index b9188371b12a..2b5a0b77e179 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1025,8 +1025,6 @@ static inline int ata_acpi_cbl_80wire(struct ata_port *ap,
1025 * PMP - drivers/ata/libata-pmp.c 1025 * PMP - drivers/ata/libata-pmp.c
1026 */ 1026 */
1027extern int sata_pmp_qc_defer_cmd_switch(struct ata_queued_cmd *qc); 1027extern int sata_pmp_qc_defer_cmd_switch(struct ata_queued_cmd *qc);
1028extern int sata_pmp_std_hardreset(struct ata_link *link, unsigned int *class,
1029 unsigned long deadline);
1030extern void sata_pmp_error_handler(struct ata_port *ap); 1028extern void sata_pmp_error_handler(struct ata_port *ap);
1031 1029
1032/* 1030/*