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

Commit 40ef1d8d authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] sata_via: convert to new EH, take #3 



Convert sata_via to new EH.  vt6420 used ATA_FLAG_SRST while vt6421
used ATA_FLAG_SATA_RESET.  This difference seems to be an accident
rather than intended.  This patch makes both flavors use
ata_bmdma_error_handler() which makes use of both SRST and SATA
hardreset.  This behavior change is intended and if it breaks
anything, it should be very easy to spot.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent c5fa46e1

drivers/scsi/sata_via.c

+6 −6
Original line number Diff line number Diff line
@@ -116,8 +116,6 @@ static const struct ata_port_operations svia_sata_ops = { 
	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.phy_reset		= sata_phy_reset,



	.bmdma_setup            = ata_bmdma_setup,

	.bmdma_start            = ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,
@@ -127,7 +125,10 @@ static const struct ata_port_operations svia_sata_ops = { 
	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_pio_data_xfer,



	.eng_timeout		= ata_eng_timeout,

	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= ata_bmdma_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,



	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,
@@ -142,7 +143,7 @@ static const struct ata_port_operations svia_sata_ops = { 


static struct ata_port_info svia_port_info = {

	.sht		= &svia_sht,

	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST | ATA_FLAG_NO_LEGACY,

	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

	.pio_mask	= 0x1f,

	.mwdma_mask	= 0x07,

	.udma_mask	= 0x7f,
@@ -237,8 +238,7 @@ static struct ata_probe_ent *vt6421_init_probe_ent(struct pci_dev *pdev) 
	INIT_LIST_HEAD(&probe_ent->node);



	probe_ent->sht		= &svia_sht;

	probe_ent->host_flags	= ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |

				  ATA_FLAG_NO_LEGACY;

	probe_ent->host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY;

	probe_ent->port_ops	= &svia_sata_ops;

	probe_ent->n_ports	= N_PORTS;

	probe_ent->irq		= pdev->irq;