Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 531db7aa authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] sata_sil: convert to new reset mechanism 



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

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent ac7c6d59

drivers/scsi/sata_sil.c

+4 −5
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static const struct ata_port_operations sil_ops = { 
	.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_port_info[] = { 
	{

		.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_port_info[] = { 
	{

		.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_port_info[] = { 
	{

		.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 */