Separate out sil24_do_softreset() which takes @pmp as its last
argument. This will be used to implement sil24_pm_softreset().
---
drivers/scsi/sata_sil24.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
201f4cac006ca715aafa794a2f7020cbc40086ca
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 34f2e67..75b04e2 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -562,7 +562,8 @@ static int sil24_exec_polled_cmd(struct
return rc;
}
-static int sil24_softreset(struct ata_link *link, unsigned int *class)
+static int sil24_do_softreset(struct ata_link *link, unsigned int *class,
+ int pmp)
{
struct ata_port *ap = link->ap;
struct ata_taskfile tf;
@@ -585,7 +586,7 @@ static int sil24_softreset(struct ata_li
/* do SRST */
ata_tf_init(link->device, &tf); /* doesn't really matter */
- rc = sil24_exec_polled_cmd(ap, PRB_CTRL_SRST, &tf, 0, 0,
+ rc = sil24_exec_polled_cmd(ap, PRB_CTRL_SRST, &tf, pmp, 0,
ATA_TMOUT_BOOT / HZ * 1000);
if (rc == -EBUSY) {
reason = "timeout";
@@ -610,6 +611,11 @@ static int sil24_softreset(struct ata_li
return -EIO;
}
+static int sil24_softreset(struct ata_link *link, unsigned int *class)
+{
+ return sil24_do_softreset(link, class, 0);
+}
+
static int sil24_hardreset(struct ata_link *link, unsigned int *class)
{
struct ata_port *ap = link->ap;
--
1.2.4
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
