[PATCH 07/15] sata_sil24: separate out sil24_do_softreset()

[Tejun Heo]

Separate out sil24_do_softreset() which takes @pmp as its last
argument.  This will be used to implement sil24_pmp_softreset().

Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>
---
 drivers/ata/sata_sil24.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 8273b8e..24d3d6b 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -587,8 +587,8 @@ static int sil24_exec_polled_cmd(struct ata_port *ap, int 
pmp,
        return rc;
 }
 
-static int sil24_softreset(struct ata_link *link, unsigned int *class,
-                          unsigned long deadline)
+static int sil24_do_softreset(struct ata_link *link, unsigned int *class,
+                             int pmp, unsigned long deadline)
 {
        struct ata_port *ap = link->ap;
        unsigned long timeout_msec = 0;
@@ -615,7 +615,8 @@ static int sil24_softreset(struct ata_link *link, unsigned 
int *class,
                timeout_msec = jiffies_to_msecs(deadline - jiffies);
 
        ata_tf_init(link->device, &tf); /* doesn't really matter */
-       rc = sil24_exec_polled_cmd(ap, 0, &tf, 0, PRB_CTRL_SRST, timeout_msec);
+       rc = sil24_exec_polled_cmd(ap, pmp, &tf, 0, PRB_CTRL_SRST,
+                                  timeout_msec);
        if (rc == -EBUSY) {
                reason = "timeout";
                goto err;
@@ -639,6 +640,12 @@ static int sil24_softreset(struct ata_link *link, unsigned 
int *class,
        return -EIO;
 }
 
+static int sil24_softreset(struct ata_link *link, unsigned int *class,
+                          unsigned long deadline)
+{
+       return sil24_do_softreset(link, class, 0, deadline);
+}
+
 static int sil24_hardreset(struct ata_link *link, unsigned int *class,
                           unsigned long deadline)
 {
-- 
1.5.0.3


-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html