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 <htejun@xxxxxxxxx> --- drivers/scsi/sata_sil24.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) fcd3110e005d4db89e0e0df4eb10230dafbf708d diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index 0ee8d45..7c868f6 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/scsi/sata_sil24.c @@ -588,7 +588,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; @@ -611,7 +612,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"; @@ -636,6 +637,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.3.2 - : 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