From 728106342c8e225c3ff44901963d272c569bd826 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 31 Oct 2007 19:28:00 +0800
Subject: [PATCH] --- yaml --- r: 73047 b: refs/heads/master c:
 066ce4db07fd547c40e57cd8a0f853124b1687aa h: refs/heads/master i:   73045:
 531cfd64ac6c785df8cc7a7859fe456159fa8537   73043:
 c01ce5494c522a5f0d0a07e492d3ce91d60b45fc   73039:
 656f31fab89b0b04c4b7ba2ab0824731e7838dd9 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/ata/sata_fsl.c | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index e95c0e48cc83..7e7dee5d7488 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25ce945a8e775d1f494447969e6a8fffcebcc352
+refs/heads/master: 066ce4db07fd547c40e57cd8a0f853124b1687aa
diff --git a/trunk/drivers/ata/sata_fsl.c b/trunk/drivers/ata/sata_fsl.c
index c47f2d4bf860..03629b687de4 100644
--- a/trunk/drivers/ata/sata_fsl.c
+++ b/trunk/drivers/ata/sata_fsl.c
@@ -991,25 +991,13 @@ static int sata_fsl_softreset(struct ata_link *link, unsigned int *class,
 	return -EIO;
 }
 
-static int sata_fsl_hardreset(struct ata_port *ap, unsigned int *class,
-			      unsigned long deadline)
-{
-	int retval;
-
-	retval = sata_std_hardreset(ap, class, deadline);
-
-	DPRINTK("SATA FSL : in xx_hardreset, retval = 0x%d\n", retval);
-
-	return retval;
-}
-
 static void sata_fsl_error_handler(struct ata_port *ap)
 {
 
 	DPRINTK("in xx_error_handler\n");
 
 	/* perform recovery */
-	ata_do_eh(ap, ata_std_prereset, sata_fsl_softreset, sata_fsl_hardreset,
+	ata_do_eh(ap, ata_std_prereset, sata_fsl_softreset, sata_std_hardreset,
 		  ata_std_postreset);
 }