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

Commit bda30288 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] Don't use old-EH ->eng_timeout() hook when not needed 



The PATA driver set got converted to the new error handling setup, but
the old hooks were accidentally left in place.  Now, removed.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ae1f19ae

drivers/ata/ata_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static struct ata_port_operations generic_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.irq_handler	= ata_interrupt,

	.irq_clear	= ata_bmdma_irq_clear,

drivers/ata/pata_ali.c

+4 −4
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static struct ata_port_operations ali_early_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,
@@ -410,7 +410,7 @@ static struct ata_port_operations ali_20_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,
@@ -448,7 +448,7 @@ static struct ata_port_operations ali_c2_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,
@@ -485,7 +485,7 @@ static struct ata_port_operations ali_c5_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,

drivers/ata/pata_amd.c

+6 −6
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static struct ata_port_operations amd33_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,
@@ -393,7 +393,7 @@ static struct ata_port_operations amd66_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,
@@ -427,7 +427,7 @@ static struct ata_port_operations amd100_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,
@@ -461,7 +461,7 @@ static struct ata_port_operations amd133_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,
@@ -495,7 +495,7 @@ static struct ata_port_operations nv100_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,
@@ -529,7 +529,7 @@ static struct ata_port_operations nv133_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,

drivers/ata/pata_artop.c

+1 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static const struct ata_port_operations artop6210_ops = { 
	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.eng_timeout		= ata_eng_timeout,



	.data_xfer		= ata_pio_data_xfer,



	.irq_handler		= ata_interrupt,
@@ -375,8 +375,6 @@ static const struct ata_port_operations artop6260_ops = { 
	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_pio_data_xfer,



	.eng_timeout		= ata_eng_timeout,



	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

drivers/ata/pata_atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static struct ata_port_operations atiixp_port_ops = { 


	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,

	.eng_timeout	= ata_eng_timeout,



	.data_xfer	= ata_pio_data_xfer,



	.irq_handler	= ata_interrupt,