diff options
author | Tejun Heo <htejun@gmail.com> | 2008-04-07 13:47:19 (GMT) |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 19:44:23 (GMT) |
commit | 57c9efdfb3cee5d4564fcb5f70555e2edb1bc52a (patch) | |
tree | c2289500f093736853a94d2d9577036658676498 /drivers/ata/libata-eh.c | |
parent | 9dadd45b24145d6aee2fabb28d7aef972301892b (diff) | |
download | linux-fsl-qoriq-57c9efdfb3cee5d4564fcb5f70555e2edb1bc52a.tar.xz |
libata: implement and use sata_std_hardreset()
Implement sata_std_hardreset(), which simply wraps around
sata_link_hardreset(). sata_std_hardreset() becomes new standard
hardreset method for sata_port_ops and sata_sff_hardreset() moves from
ata_base_port_ops to ata_sff_port_ops, which is where it really
belongs.
ata_is_builtin_hardreset() is added so that both
ata_std_error_handler() and ata_sff_error_handler() skip both builtin
hardresets if SCR isn't accessible.
piix_sidpr_hardreset() in ata_piix.c is identical to
sata_std_hardreset() in functionality and got replaced with the
standard function.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r-- | drivers/ata/libata-eh.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index f4f9c27..21687bb 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2857,11 +2857,8 @@ void ata_std_error_handler(struct ata_port *ap) struct ata_port_operations *ops = ap->ops; ata_reset_fn_t hardreset = ops->hardreset; - /* sata_std_hardreset is inherited to all drivers from - * ata_base_port_ops. Ignore it if SCR access is not - * available. - */ - if (hardreset == sata_sff_hardreset && !sata_scr_valid(&ap->link)) + /* ignore built-in hardreset if SCR access is not available */ + if (ata_is_builtin_hardreset(hardreset) && !sata_scr_valid(&ap->link)) hardreset = NULL; ata_do_eh(ap, ops->prereset, ops->softreset, hardreset, ops->postreset); |