diff options
-rw-r--r-- | drivers/scsi/libata-eh.c | 3 | ||||
-rw-r--r-- | drivers/scsi/libata.h | 1 | ||||
-rw-r--r-- | include/linux/libata.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c index e73f5612aea8..b518654b9d60 100644 --- a/drivers/scsi/libata-eh.c +++ b/drivers/scsi/libata-eh.c | |||
@@ -97,7 +97,7 @@ enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd) | |||
97 | * RETURNS: | 97 | * RETURNS: |
98 | * Zero. | 98 | * Zero. |
99 | */ | 99 | */ |
100 | int ata_scsi_error(struct Scsi_Host *host) | 100 | void ata_scsi_error(struct Scsi_Host *host) |
101 | { | 101 | { |
102 | struct ata_port *ap = (struct ata_port *)&host->hostdata[0]; | 102 | struct ata_port *ap = (struct ata_port *)&host->hostdata[0]; |
103 | 103 | ||
@@ -116,7 +116,6 @@ int ata_scsi_error(struct Scsi_Host *host) | |||
116 | scsi_eh_flush_done_q(&ap->eh_done_q); | 116 | scsi_eh_flush_done_q(&ap->eh_done_q); |
117 | 117 | ||
118 | DPRINTK("EXIT\n"); | 118 | DPRINTK("EXIT\n"); |
119 | return 0; | ||
120 | } | 119 | } |
121 | 120 | ||
122 | /** | 121 | /** |
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index 652c08e3808e..b18d377588dc 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
@@ -105,5 +105,6 @@ extern void ata_scsi_rbuf_fill(struct ata_scsi_args *args, | |||
105 | 105 | ||
106 | /* libata-eh.c */ | 106 | /* libata-eh.c */ |
107 | extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd); | 107 | extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd); |
108 | extern void ata_scsi_error(struct Scsi_Host *host); | ||
108 | 109 | ||
109 | #endif /* __LIBATA_H__ */ | 110 | #endif /* __LIBATA_H__ */ |
diff --git a/include/linux/libata.h b/include/linux/libata.h index a7161d42d18f..2564bc514bca 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -637,7 +637,6 @@ extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_ | |||
637 | /* | 637 | /* |
638 | * EH | 638 | * EH |
639 | */ | 639 | */ |
640 | extern int ata_scsi_error(struct Scsi_Host *host); | ||
641 | extern void ata_eng_timeout(struct ata_port *ap); | 640 | extern void ata_eng_timeout(struct ata_port *ap); |
642 | extern void ata_eh_qc_complete(struct ata_queued_cmd *qc); | 641 | extern void ata_eh_qc_complete(struct ata_queued_cmd *qc); |
643 | extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); | 642 | extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); |