From 77b0382875295525fe6b98f946041596ff027275 Mon Sep 17 00:00:00 2001 Message-Id: <77b0382875295525fe6b98f946041596ff027275.1167304868.git.robbat2@gentoo.org> In-Reply-To: <7498034fbbadc770e50ec1d4c674d3a79a684524.1167304867.git.robbat2@gentoo.org> References: <7498034fbbadc770e50ec1d4c674d3a79a684524.1167304867.git.robbat2@gentoo.org> From: Tejun Heo Date: Mon, 16 Oct 2006 07:24:54 +0900 Subject: [PATCH 10/13] [PATCH] sata_sil24: separate out sil24_do_softreset() 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 Signed-off-by: Robin H. Johnson --- drivers/ata/sata_sil24.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 29e53d6..4530254 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -593,7 +593,8 @@ static int sil24_exec_polled_cmd(struct ata_port *ap, u32 ctrl, 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; @@ -616,7 +617,7 @@ static int sil24_softreset(struct ata_link *link, unsigned int *class) /* 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"; @@ -641,6 +642,11 @@ static int sil24_softreset(struct ata_link *link, unsigned int *class) 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.4.4.3