summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata.h
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-10-09 15:05:44 +0900
committerJeff Garzik <jeff@garzik.org>2007-10-12 14:55:47 -0400
commit2b789108fc1dcba22050a7e6e29ae5ebaea427dd (patch)
tree1c241e249c388d956ad9771efacfd827a24ec41e /drivers/ata/libata.h
parent5f226c6bf78edab023ed1ea679531731d9df92a6 (diff)
downloadlinux-2b789108fc1dcba22050a7e6e29ae5ebaea427dd.tar.gz
linux-2b789108fc1dcba22050a7e6e29ae5ebaea427dd.tar.bz2
linux-2b789108fc1dcba22050a7e6e29ae5ebaea427dd.zip
libata: add @timeout to ata_exec_internal[_sg]()
Add @timeout argument to ata_exec_internal[_sg](). If 0, default timeout ata_probe_timeout is used. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata.h')
-rw-r--r--drivers/ata/libata.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index f8bd955c5ba7..90df58a3edc9 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -69,11 +69,12 @@ extern void ata_dev_disable(struct ata_device *dev);
extern void ata_port_flush_task(struct ata_port *ap);
extern unsigned ata_exec_internal(struct ata_device *dev,
struct ata_taskfile *tf, const u8 *cdb,
- int dma_dir, void *buf, unsigned int buflen);
+ int dma_dir, void *buf, unsigned int buflen,
+ unsigned long timeout);
extern unsigned ata_exec_internal_sg(struct ata_device *dev,
struct ata_taskfile *tf, const u8 *cdb,
int dma_dir, struct scatterlist *sg,
- unsigned int n_elem);
+ unsigned int n_elem, unsigned long timeout);
extern unsigned int ata_do_simple_cmd(struct ata_device *dev, u8 cmd);
extern int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
unsigned int flags, u16 *id);