[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: Jeff Garzik <jeff@garzik.org>

34 files changed, 54 insertions, 74 deletions

diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 1d1c30a2fcd0..377425e71391 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -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,
 
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 8448ee6e0eed..87af3b5861ab 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -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,
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 793a5e1cb4cb..599ee266722c 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -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,
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 0f3b49176dc1..c4ccb75a4f1d 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -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,
 
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 060d019fd30b..6c2269b6bd3c 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -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,
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index abf1bb7bd322..e92b0ef43ec5 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -301,7 +301,7 @@ static struct ata_port_operations cmd64x_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,
@@ -335,7 +335,7 @@ static struct ata_port_operations cmd646r1_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,
@@ -369,7 +369,7 @@ static struct ata_port_operations cmd648_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,
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 792ce4828510..a6c6cebd0dae 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -193,8 +193,6 @@ static struct ata_port_operations cs5520_port_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,
 
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index f3d8a3bc1e78..7bba4d954e9c 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -207,7 +207,7 @@ static struct ata_port_operations cs5530_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = cs5530_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_handler    = ata_interrupt,
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 69d6b4258724..d64fcdceaf01 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -211,7 +211,7 @@ static struct ata_port_operations cs5535_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,
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index fd55474e0d15..dfa5ac539048 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -162,7 +162,7 @@ static struct ata_port_operations cy82c693_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,
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 92813827faa7..95cd1ca181f5 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -261,8 +261,6 @@ static const struct ata_port_operations efar_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,
 
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 94bb1dfc3f19..cf656ecbe507 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -360,7 +360,7 @@ static struct ata_port_operations hpt366_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,
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 532a7928f803..10318c0012ef 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -793,7 +793,7 @@ static struct ata_port_operations hpt370_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,
@@ -832,7 +832,7 @@ static struct ata_port_operations hpt370a_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,
@@ -872,7 +872,7 @@ static struct ata_port_operations hpt372_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,
@@ -912,7 +912,7 @@ static struct ata_port_operations hpt374_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,
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index 06c8db079b91..5c5d4f6ab901 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -372,7 +372,7 @@ static struct ata_port_operations hpt3x2n_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = hpt3x2n_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_handler    = ata_interrupt,
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index 152770133ab1..1f084ab1ccc6 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -145,7 +145,7 @@ static struct ata_port_operations hpt3x3_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,
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 73948c8b7270..640b8b0954f5 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -52,7 +52,7 @@ static struct ata_port_operations isapnp_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,
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index af39097d8081..82a46ff40000 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -703,7 +703,7 @@ static struct ata_port_operations it821x_smart_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = it821x_smart_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_handler    = ata_interrupt,
@@ -739,7 +739,7 @@ static struct ata_port_operations it821x_passthru_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = it821x_passthru_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_clear      = ata_bmdma_irq_clear,
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 3bdb6f2fa5ba..be3a866b111f 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -164,8 +164,7 @@ static const struct ata_port_operations jmicron_ops = {
         .qc_issue               = ata_qc_issue_prot,
         .data_xfer              = ata_pio_data_xfer,
 
-        /* Timeout handling. Special recovery hooks here */
-        .eng_timeout            = ata_eng_timeout,
+        /* IRQ-related hooks */
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
 
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index ad37c220bb2c..10231ef731d1 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -161,7 +161,7 @@ static struct ata_port_operations simple_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer_noirq,
 
         .irq_handler    = ata_interrupt,
@@ -186,7 +186,7 @@ static struct ata_port_operations legacy_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer_noirq,
 
         .irq_handler    = ata_interrupt,
@@ -296,7 +296,7 @@ static struct ata_port_operations pdc20230_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = pdc_data_xfer_vlb,
 
         .irq_handler    = ata_interrupt,
@@ -348,7 +348,7 @@ static struct ata_port_operations ht6560a_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,    /* Check vlb/noirq */
 
         .irq_handler    = ata_interrupt,
@@ -411,7 +411,7 @@ static struct ata_port_operations ht6560b_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,    /* FIXME: Check 32bit and noirq */
 
         .irq_handler    = ata_interrupt,
@@ -529,7 +529,7 @@ static struct ata_port_operations opti82c611a_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,
@@ -659,7 +659,7 @@ static struct ata_port_operations opti82c46x_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = opti82c46x_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_handler    = ata_interrupt,
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index 16cb254cb973..76eb9c90bee1 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -90,8 +90,7 @@ static const struct ata_port_operations netcell_ops = {
         .qc_issue               = ata_qc_issue_prot,
         .data_xfer              = ata_pio_data_xfer,
 
-        /* Timeout handling. Special recovery hooks here */
-        .eng_timeout            = ata_eng_timeout,
+        /* IRQ-related hooks */
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
 
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index f529fe4c29b7..2005a95f48f6 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -176,7 +176,7 @@ static struct ata_port_operations ns87410_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ns87410_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_handler    = ata_interrupt,
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index 136d7a65feb3..57fe21f3a975 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -227,7 +227,7 @@ static struct ata_port_operations opti_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,
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 18ec8e72bbb6..7296a20cd107 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -386,7 +386,7 @@ static struct ata_port_operations optidma_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,
@@ -421,7 +421,7 @@ static struct ata_port_operations optiplus_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,
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 62b25cda409b..cb501e145a42 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -87,7 +87,7 @@ static struct ata_port_operations pcmcia_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer_noirq,
 
         .irq_handler    = ata_interrupt,
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 35cfdf0ac3f0..7977f471d5e9 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -184,7 +184,7 @@ static struct ata_port_operations qdi6500_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = qdi_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = qdi_data_xfer,
 
         .irq_handler    = ata_interrupt,
@@ -212,7 +212,7 @@ static struct ata_port_operations qdi6580_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = qdi_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = qdi_data_xfer,
 
         .irq_handler    = ata_interrupt,
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 277f8411b521..c20bcf43ed6d 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -255,8 +255,6 @@ static const struct ata_port_operations radisys_pata_ops = {
         .qc_issue               = radisys_qc_issue_prot,
         .data_xfer              = ata_pio_data_xfer,
 
-        .eng_timeout            = ata_eng_timeout,
-
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
 
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 3c6d84fd4312..eccc6fd45032 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -112,7 +112,7 @@ static struct ata_port_operations rz1000_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .freeze         = ata_bmdma_freeze,
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 4166c1a8a9e8..107e6cd3dc0d 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -217,7 +217,7 @@ static struct ata_port_operations sc1200_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = sc1200_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_handler    = ata_interrupt,
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index d62051b8da05..a5c8d7e121d1 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -352,7 +352,7 @@ static struct ata_port_operations serverworks_osb4_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,
@@ -387,7 +387,7 @@ static struct ata_port_operations serverworks_csb_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,
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 8f7db9638d0a..c8b2e26db70d 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -251,7 +251,7 @@ static struct ata_port_operations sil680_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,
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index fce74d9b2e67..17791e2785f9 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -573,8 +573,6 @@ static const struct ata_port_operations sis_133_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,
 
@@ -608,8 +606,6 @@ static const struct ata_port_operations sis_133_early_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,
 
@@ -644,8 +640,6 @@ static const struct ata_port_operations sis_100_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,
 
@@ -679,8 +673,6 @@ static const struct ata_port_operations sis_66_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,
 
@@ -714,8 +706,6 @@ static const struct ata_port_operations sis_old_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,
 
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index b3bc607f0293..5b762acc5687 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -261,7 +261,7 @@ static struct ata_port_operations sl82c105_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,
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index 95adf92901fc..a954ed93a40c 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -218,7 +218,7 @@ static struct ata_port_operations triflex_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,
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 0e8b1303acd6..7b5dd2343b9a 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -322,7 +322,7 @@ static struct ata_port_operations via_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,
@@ -357,7 +357,7 @@ static struct ata_port_operations via_port_ops_noirq = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer_noirq,
 
         .irq_handler    = ata_interrupt,