Merge tag 'vfio-v6.0-rc1' of https://github.com/awilliam/linux-vfio

[linux-2.6-microblaze.git] / drivers / ata / libata.h

diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 926a7f4..98bc864 100644 (file)
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -52,11 +52,7 @@ extern u64 ata_tf_read_block(const struct ata_taskfile *tf,
 extern unsigned ata_exec_internal(struct ata_device *dev,
                                  struct ata_taskfile *tf, const u8 *cdb,
                                  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 long timeout);
+                                 unsigned int timeout);
 extern int ata_wait_ready(struct ata_link *link, unsigned long deadline,
                          int (*check_ready)(struct ata_link *link));
 extern int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
@@ -136,7 +132,7 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev);
 int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev);
 
 /* libata-eh.c */
-extern unsigned long ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd);
+extern unsigned int ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd);
 extern void ata_internal_cmd_timed_out(struct ata_device *dev, u8 cmd);
 extern void ata_eh_acquire(struct ata_port *ap);
 extern void ata_eh_release(struct ata_port *ap);