diff options
author | Tejun Heo <tj@kernel.org> | 2010-09-06 11:56:29 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2010-10-21 20:21:05 -0400 |
commit | 97750cebb3000a9cc08f8ce8dc8c7143be7d7201 (patch) | |
tree | 04220b8a8ed3f353e3e0023805b32e7d746dc6f3 /include/linux/libata.h | |
parent | a97c40068fab5d85c4241451fc312cb9025d7e6c (diff) |
libata: add @ap to ata_wait_register() and introduce ata_msleep()
Add optional @ap argument to ata_wait_register() and replace msleep()
calls with ata_msleep() which take optional @ap in addition to the
duration. These will be used to implement EH exclusion.
This patch doesn't cause any behavior difference.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r-- | include/linux/libata.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index bc4ee218b185..2fbd22bd68ce 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -1004,8 +1004,9 @@ extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg); | |||
1004 | extern void ata_host_resume(struct ata_host *host); | 1004 | extern void ata_host_resume(struct ata_host *host); |
1005 | #endif | 1005 | #endif |
1006 | extern int ata_ratelimit(void); | 1006 | extern int ata_ratelimit(void); |
1007 | extern u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val, | 1007 | extern void ata_msleep(struct ata_port *ap, unsigned int msecs); |
1008 | unsigned long interval, unsigned long timeout); | 1008 | extern u32 ata_wait_register(struct ata_port *ap, void __iomem *reg, u32 mask, |
1009 | u32 val, unsigned long interval, unsigned long timeout); | ||
1009 | extern int atapi_cmd_type(u8 opcode); | 1010 | extern int atapi_cmd_type(u8 opcode); |
1010 | extern void ata_tf_to_fis(const struct ata_taskfile *tf, | 1011 | extern void ata_tf_to_fis(const struct ata_taskfile *tf, |
1011 | u8 pmp, int is_cmd, u8 *fis); | 1012 | u8 pmp, int is_cmd, u8 *fis); |