From 79024303f06bd556bf928f9db3228ffe649621d2 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 11 Apr 2006 13:04:39 -0400
Subject: [PATCH] --- yaml --- r: 29246 b: refs/heads/master c:
 381544bba3ae6f2f1004b267da34f840b469033c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/libata-eh.c | 3 +--
 trunk/drivers/scsi/libata.h    | 1 +
 trunk/include/linux/libata.h   | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b3c35540fff3..adc1d92c4a31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1
+refs/heads/master: 381544bba3ae6f2f1004b267da34f840b469033c
diff --git a/trunk/drivers/scsi/libata-eh.c b/trunk/drivers/scsi/libata-eh.c
index e73f5612aea8..b518654b9d60 100644
--- a/trunk/drivers/scsi/libata-eh.c
+++ b/trunk/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/trunk/drivers/scsi/libata.h b/trunk/drivers/scsi/libata.h
index 652c08e3808e..b18d377588dc 100644
--- a/trunk/drivers/scsi/libata.h
+++ b/trunk/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/trunk/include/linux/libata.h b/trunk/include/linux/libata.h
index a7161d42d18f..2564bc514bca 100644
--- a/trunk/include/linux/libata.h
+++ b/trunk/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);