libata: Fix EH merge difference between this branch and upstream.

diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index e73f5612aea8f355d60eaced846307875c7e74f4..b518654b9d6027c4ea8cebe8049c4c40074baaec 100644 (file)
--- 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)
  *     RETURNS:
  *     Zero.
  */
-int ata_scsi_error(struct Scsi_Host *host)
+void ata_scsi_error(struct Scsi_Host *host)
 {
        struct ata_port *ap = (struct ata_port *)&host->hostdata[0];
 
@@ -116,7 +116,6 @@ int ata_scsi_error(struct Scsi_Host *host)
        scsi_eh_flush_done_q(&ap->eh_done_q);
 
        DPRINTK("EXIT\n");
-       return 0;
 }
 
 /**

diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 652c08e3808e66bcc50ae03613d0b98691251e06..b18d377588dc5fd85a3e99c70a381482f0fff38e 100644 (file)
--- 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,
 
 /* libata-eh.c */
 extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);
+extern void ata_scsi_error(struct Scsi_Host *host);
 
 #endif /* __LIBATA_H__ */

diff --git a/include/linux/libata.h b/include/linux/libata.h
index a7161d42d18f07ac79b398a7544d1a5afd7c7f4e..2564bc514bcab051ae2f5d86ee8540373472c459 100644 (file)
--- 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_
 /*
  * EH
  */
-extern int ata_scsi_error(struct Scsi_Host *host);
 extern void ata_eng_timeout(struct ata_port *ap);
 extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
 extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);