linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tejun Heo <htejun@gmail.com>
To: jgarzik@pobox.com, albertcc@tw.ibm.com, linux-ide@vger.kernel.org
Cc: Tejun Heo <htejun@gmail.com>
Subject: [PATCH 3/9] sata_sil: convert to new reset mechanism
Date: Fri, 10 Feb 2006 23:58:48 +0900	[thread overview]
Message-ID: <11395835281210-git-send-email-htejun@gmail.com> (raw)
In-Reply-To: <11395835282719-git-send-email-htejun@gmail.com>

Convert sata_sil to use new reset mechanism.  sata_sil is fairly
generic and can directly use std routine.

Signed-off-by: Tejun Heo <htejun@gmail.com>

---

 drivers/scsi/sata_sil.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

0ae93718b02a7763abfacd0a900b51ba27c6212d
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index f40f25e..bd28877 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -158,7 +158,7 @@ static const struct ata_port_operations 
 	.check_status		= ata_check_status,
 	.exec_command		= ata_exec_command,
 	.dev_select		= ata_std_dev_select,
-	.phy_reset		= sata_phy_reset,
+	.probe_reset		= ata_std_probe_reset,
 	.post_set_mode		= sil_post_set_mode,
 	.bmdma_setup            = ata_bmdma_setup,
 	.bmdma_start            = ata_bmdma_start,
@@ -181,7 +181,7 @@ static const struct ata_port_info sil_po
 	{
 		.sht		= &sil_sht,
 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-				  ATA_FLAG_SRST | ATA_FLAG_MMIO,
+				  ATA_FLAG_MMIO,
 		.pio_mask	= 0x1f,			/* pio0-4 */
 		.mwdma_mask	= 0x07,			/* mwdma0-2 */
 		.udma_mask	= 0x3f,			/* udma0-5 */
@@ -190,8 +190,7 @@ static const struct ata_port_info sil_po
 	{
 		.sht		= &sil_sht,
 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-				  ATA_FLAG_SRST | ATA_FLAG_MMIO |
-				  SIL_FLAG_MOD15WRITE,
+				  ATA_FLAG_MMIO | SIL_FLAG_MOD15WRITE,
 		.pio_mask	= 0x1f,			/* pio0-4 */
 		.mwdma_mask	= 0x07,			/* mwdma0-2 */
 		.udma_mask	= 0x3f,			/* udma0-5 */
@@ -200,7 +199,7 @@ static const struct ata_port_info sil_po
 	{
 		.sht		= &sil_sht,
 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-				  ATA_FLAG_SRST | ATA_FLAG_MMIO,
+				  ATA_FLAG_MMIO,
 		.pio_mask	= 0x1f,			/* pio0-4 */
 		.mwdma_mask	= 0x07,			/* mwdma0-2 */
 		.udma_mask	= 0x3f,			/* udma0-5 */
-- 
1.1.5



  parent reply	other threads:[~2006-02-10 14:58 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-10 14:58 [PATCHSET] libata: various fixes related to EH, take #4 Tejun Heo
2006-02-10 14:58 ` [PATCH 7/9] ata_piix: convert sata to new reset mechanism Tejun Heo
2006-02-11 23:30   ` Jeff Garzik
2006-02-10 14:58 ` [PATCH 5/9] sata_sil24: add hardreset Tejun Heo
2006-02-10 14:58 ` [PATCH 1/9] libata: make new reset act identical to ->phy_reset register-wise Tejun Heo
2006-02-10 15:30   ` Jeff Garzik
2006-02-10 14:58 ` Tejun Heo [this message]
2006-02-10 14:58 ` [PATCH 6/9] ata_piix: convert pata to new reset mechanism Tejun Heo
2006-02-11 23:29   ` Jeff Garzik
2006-02-10 14:58 ` [PATCH 4/9] sata_sil24: convert " Tejun Heo
2006-02-10 14:58 ` [PATCH 2/9] libata: kill SError clearing in sata_std_hardreset() Tejun Heo
2006-02-10 14:58 ` [PATCH 9/9] ahci: add softreset Tejun Heo
2006-02-10 14:58 ` [PATCH 8/9] ahci: convert to new reset mechanism Tejun Heo
2006-02-10 15:01 ` Sorry, wrong PATCHSET name, it should be [PATCHSET] libata: various fixes related to EH, take #4 Tejun Heo
2006-02-10 15:04   ` Gee, wrong again. libata: [PATCHSET] libata: new reset mechanism, take#4 Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11395835281210-git-send-email-htejun@gmail.com \
    --to=htejun@gmail.com \
    --cc=albertcc@tw.ibm.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-ide@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).