diff options
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r-- | include/linux/libata.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index a6d829cb0567..75bdee09c307 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -531,9 +531,6 @@ extern void ata_host_set_remove(struct ata_host_set *host_set); | |||
531 | extern int ata_scsi_detect(struct scsi_host_template *sht); | 531 | extern int ata_scsi_detect(struct scsi_host_template *sht); |
532 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | 532 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); |
533 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); | 533 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); |
534 | extern int ata_scsi_error(struct Scsi_Host *host); | ||
535 | extern void ata_eh_qc_complete(struct ata_queued_cmd *qc); | ||
536 | extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); | ||
537 | extern int ata_scsi_release(struct Scsi_Host *host); | 534 | extern int ata_scsi_release(struct Scsi_Host *host); |
538 | extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); | 535 | extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); |
539 | extern int ata_scsi_device_resume(struct scsi_device *); | 536 | extern int ata_scsi_device_resume(struct scsi_device *); |
@@ -582,7 +579,6 @@ extern void ata_bmdma_stop(struct ata_queued_cmd *qc); | |||
582 | extern u8 ata_bmdma_status(struct ata_port *ap); | 579 | extern u8 ata_bmdma_status(struct ata_port *ap); |
583 | extern void ata_bmdma_irq_clear(struct ata_port *ap); | 580 | extern void ata_bmdma_irq_clear(struct ata_port *ap); |
584 | extern void __ata_qc_complete(struct ata_queued_cmd *qc); | 581 | extern void __ata_qc_complete(struct ata_queued_cmd *qc); |
585 | extern void ata_eng_timeout(struct ata_port *ap); | ||
586 | extern void ata_scsi_simulate(struct ata_port *ap, struct ata_device *dev, | 582 | extern void ata_scsi_simulate(struct ata_port *ap, struct ata_device *dev, |
587 | struct scsi_cmnd *cmd, | 583 | struct scsi_cmnd *cmd, |
588 | void (*done)(struct scsi_cmnd *)); | 584 | void (*done)(struct scsi_cmnd *)); |
@@ -637,6 +633,14 @@ extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bit | |||
637 | extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_device *, unsigned long); | 633 | extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_device *, unsigned long); |
638 | #endif /* CONFIG_PCI */ | 634 | #endif /* CONFIG_PCI */ |
639 | 635 | ||
636 | /* | ||
637 | * EH | ||
638 | */ | ||
639 | extern int ata_scsi_error(struct Scsi_Host *host); | ||
640 | extern void ata_eng_timeout(struct ata_port *ap); | ||
641 | extern void ata_eh_qc_complete(struct ata_queued_cmd *qc); | ||
642 | extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); | ||
643 | |||
640 | 644 | ||
641 | static inline int | 645 | static inline int |
642 | ata_sg_is_last(struct scatterlist *sg, struct ata_queued_cmd *qc) | 646 | ata_sg_is_last(struct scatterlist *sg, struct ata_queued_cmd *qc) |