diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 05:41:13 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 05:41:13 -0400 |
commit | bda3028813bd07f34f30288a492fbf6f7b8712dd (patch) | |
tree | 2773c970205cfa0c918dc7e5cb3a77a8b26e1e57 /drivers | |
parent | ae1f19aeb715098ac06323f279383f3843429d97 (diff) |
[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>
Diffstat (limited to 'drivers')
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 = { | |||
143 | 143 | ||
144 | .qc_prep = ata_qc_prep, | 144 | .qc_prep = ata_qc_prep, |
145 | .qc_issue = ata_qc_issue_prot, | 145 | .qc_issue = ata_qc_issue_prot, |
146 | .eng_timeout = ata_eng_timeout, | 146 | |
147 | .irq_handler = ata_interrupt, | 147 | .irq_handler = ata_interrupt, |
148 | .irq_clear = ata_bmdma_irq_clear, | 148 | .irq_clear = ata_bmdma_irq_clear, |
149 | 149 | ||
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 = { | |||
369 | 369 | ||
370 | .qc_prep = ata_qc_prep, | 370 | .qc_prep = ata_qc_prep, |
371 | .qc_issue = ata_qc_issue_prot, | 371 | .qc_issue = ata_qc_issue_prot, |
372 | .eng_timeout = ata_eng_timeout, | 372 | |
373 | .data_xfer = ata_pio_data_xfer, | 373 | .data_xfer = ata_pio_data_xfer, |
374 | 374 | ||
375 | .irq_handler = ata_interrupt, | 375 | .irq_handler = ata_interrupt, |
@@ -410,7 +410,7 @@ static struct ata_port_operations ali_20_port_ops = { | |||
410 | 410 | ||
411 | .qc_prep = ata_qc_prep, | 411 | .qc_prep = ata_qc_prep, |
412 | .qc_issue = ata_qc_issue_prot, | 412 | .qc_issue = ata_qc_issue_prot, |
413 | .eng_timeout = ata_eng_timeout, | 413 | |
414 | .data_xfer = ata_pio_data_xfer, | 414 | .data_xfer = ata_pio_data_xfer, |
415 | 415 | ||
416 | .irq_handler = ata_interrupt, | 416 | .irq_handler = ata_interrupt, |
@@ -448,7 +448,7 @@ static struct ata_port_operations ali_c2_port_ops = { | |||
448 | 448 | ||
449 | .qc_prep = ata_qc_prep, | 449 | .qc_prep = ata_qc_prep, |
450 | .qc_issue = ata_qc_issue_prot, | 450 | .qc_issue = ata_qc_issue_prot, |
451 | .eng_timeout = ata_eng_timeout, | 451 | |
452 | .data_xfer = ata_pio_data_xfer, | 452 | .data_xfer = ata_pio_data_xfer, |
453 | 453 | ||
454 | .irq_handler = ata_interrupt, | 454 | .irq_handler = ata_interrupt, |
@@ -485,7 +485,7 @@ static struct ata_port_operations ali_c5_port_ops = { | |||
485 | 485 | ||
486 | .qc_prep = ata_qc_prep, | 486 | .qc_prep = ata_qc_prep, |
487 | .qc_issue = ata_qc_issue_prot, | 487 | .qc_issue = ata_qc_issue_prot, |
488 | .eng_timeout = ata_eng_timeout, | 488 | |
489 | .data_xfer = ata_pio_data_xfer, | 489 | .data_xfer = ata_pio_data_xfer, |
490 | 490 | ||
491 | .irq_handler = ata_interrupt, | 491 | .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 = { | |||
359 | 359 | ||
360 | .qc_prep = ata_qc_prep, | 360 | .qc_prep = ata_qc_prep, |
361 | .qc_issue = ata_qc_issue_prot, | 361 | .qc_issue = ata_qc_issue_prot, |
362 | .eng_timeout = ata_eng_timeout, | 362 | |
363 | .data_xfer = ata_pio_data_xfer, | 363 | .data_xfer = ata_pio_data_xfer, |
364 | 364 | ||
365 | .irq_handler = ata_interrupt, | 365 | .irq_handler = ata_interrupt, |
@@ -393,7 +393,7 @@ static struct ata_port_operations amd66_port_ops = { | |||
393 | 393 | ||
394 | .qc_prep = ata_qc_prep, | 394 | .qc_prep = ata_qc_prep, |
395 | .qc_issue = ata_qc_issue_prot, | 395 | .qc_issue = ata_qc_issue_prot, |
396 | .eng_timeout = ata_eng_timeout, | 396 | |
397 | .data_xfer = ata_pio_data_xfer, | 397 | .data_xfer = ata_pio_data_xfer, |
398 | 398 | ||
399 | .irq_handler = ata_interrupt, | 399 | .irq_handler = ata_interrupt, |
@@ -427,7 +427,7 @@ static struct ata_port_operations amd100_port_ops = { | |||
427 | 427 | ||
428 | .qc_prep = ata_qc_prep, | 428 | .qc_prep = ata_qc_prep, |
429 | .qc_issue = ata_qc_issue_prot, | 429 | .qc_issue = ata_qc_issue_prot, |
430 | .eng_timeout = ata_eng_timeout, | 430 | |
431 | .data_xfer = ata_pio_data_xfer, | 431 | .data_xfer = ata_pio_data_xfer, |
432 | 432 | ||
433 | .irq_handler = ata_interrupt, | 433 | .irq_handler = ata_interrupt, |
@@ -461,7 +461,7 @@ static struct ata_port_operations amd133_port_ops = { | |||
461 | 461 | ||
462 | .qc_prep = ata_qc_prep, | 462 | .qc_prep = ata_qc_prep, |
463 | .qc_issue = ata_qc_issue_prot, | 463 | .qc_issue = ata_qc_issue_prot, |
464 | .eng_timeout = ata_eng_timeout, | 464 | |
465 | .data_xfer = ata_pio_data_xfer, | 465 | .data_xfer = ata_pio_data_xfer, |
466 | 466 | ||
467 | .irq_handler = ata_interrupt, | 467 | .irq_handler = ata_interrupt, |
@@ -495,7 +495,7 @@ static struct ata_port_operations nv100_port_ops = { | |||
495 | 495 | ||
496 | .qc_prep = ata_qc_prep, | 496 | .qc_prep = ata_qc_prep, |
497 | .qc_issue = ata_qc_issue_prot, | 497 | .qc_issue = ata_qc_issue_prot, |
498 | .eng_timeout = ata_eng_timeout, | 498 | |
499 | .data_xfer = ata_pio_data_xfer, | 499 | .data_xfer = ata_pio_data_xfer, |
500 | 500 | ||
501 | .irq_handler = ata_interrupt, | 501 | .irq_handler = ata_interrupt, |
@@ -529,7 +529,7 @@ static struct ata_port_operations nv133_port_ops = { | |||
529 | 529 | ||
530 | .qc_prep = ata_qc_prep, | 530 | .qc_prep = ata_qc_prep, |
531 | .qc_issue = ata_qc_issue_prot, | 531 | .qc_issue = ata_qc_issue_prot, |
532 | .eng_timeout = ata_eng_timeout, | 532 | |
533 | .data_xfer = ata_pio_data_xfer, | 533 | .data_xfer = ata_pio_data_xfer, |
534 | 534 | ||
535 | .irq_handler = ata_interrupt, | 535 | .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 = { | |||
340 | .bmdma_status = ata_bmdma_status, | 340 | .bmdma_status = ata_bmdma_status, |
341 | .qc_prep = ata_qc_prep, | 341 | .qc_prep = ata_qc_prep, |
342 | .qc_issue = ata_qc_issue_prot, | 342 | .qc_issue = ata_qc_issue_prot, |
343 | .eng_timeout = ata_eng_timeout, | 343 | |
344 | .data_xfer = ata_pio_data_xfer, | 344 | .data_xfer = ata_pio_data_xfer, |
345 | 345 | ||
346 | .irq_handler = ata_interrupt, | 346 | .irq_handler = ata_interrupt, |
@@ -375,8 +375,6 @@ static const struct ata_port_operations artop6260_ops = { | |||
375 | .qc_issue = ata_qc_issue_prot, | 375 | .qc_issue = ata_qc_issue_prot, |
376 | .data_xfer = ata_pio_data_xfer, | 376 | .data_xfer = ata_pio_data_xfer, |
377 | 377 | ||
378 | .eng_timeout = ata_eng_timeout, | ||
379 | |||
380 | .irq_handler = ata_interrupt, | 378 | .irq_handler = ata_interrupt, |
381 | .irq_clear = ata_bmdma_irq_clear, | 379 | .irq_clear = ata_bmdma_irq_clear, |
382 | 380 | ||
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 = { | |||
242 | 242 | ||
243 | .qc_prep = ata_qc_prep, | 243 | .qc_prep = ata_qc_prep, |
244 | .qc_issue = ata_qc_issue_prot, | 244 | .qc_issue = ata_qc_issue_prot, |
245 | .eng_timeout = ata_eng_timeout, | 245 | |
246 | .data_xfer = ata_pio_data_xfer, | 246 | .data_xfer = ata_pio_data_xfer, |
247 | 247 | ||
248 | .irq_handler = ata_interrupt, | 248 | .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 = { | |||
301 | 301 | ||
302 | .qc_prep = ata_qc_prep, | 302 | .qc_prep = ata_qc_prep, |
303 | .qc_issue = ata_qc_issue_prot, | 303 | .qc_issue = ata_qc_issue_prot, |
304 | .eng_timeout = ata_eng_timeout, | 304 | |
305 | .data_xfer = ata_pio_data_xfer, | 305 | .data_xfer = ata_pio_data_xfer, |
306 | 306 | ||
307 | .irq_handler = ata_interrupt, | 307 | .irq_handler = ata_interrupt, |
@@ -335,7 +335,7 @@ static struct ata_port_operations cmd646r1_port_ops = { | |||
335 | 335 | ||
336 | .qc_prep = ata_qc_prep, | 336 | .qc_prep = ata_qc_prep, |
337 | .qc_issue = ata_qc_issue_prot, | 337 | .qc_issue = ata_qc_issue_prot, |
338 | .eng_timeout = ata_eng_timeout, | 338 | |
339 | .data_xfer = ata_pio_data_xfer, | 339 | .data_xfer = ata_pio_data_xfer, |
340 | 340 | ||
341 | .irq_handler = ata_interrupt, | 341 | .irq_handler = ata_interrupt, |
@@ -369,7 +369,7 @@ static struct ata_port_operations cmd648_port_ops = { | |||
369 | 369 | ||
370 | .qc_prep = ata_qc_prep, | 370 | .qc_prep = ata_qc_prep, |
371 | .qc_issue = ata_qc_issue_prot, | 371 | .qc_issue = ata_qc_issue_prot, |
372 | .eng_timeout = ata_eng_timeout, | 372 | |
373 | .data_xfer = ata_pio_data_xfer, | 373 | .data_xfer = ata_pio_data_xfer, |
374 | 374 | ||
375 | .irq_handler = ata_interrupt, | 375 | .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 = { | |||
193 | .qc_issue = ata_qc_issue_prot, | 193 | .qc_issue = ata_qc_issue_prot, |
194 | .data_xfer = ata_pio_data_xfer, | 194 | .data_xfer = ata_pio_data_xfer, |
195 | 195 | ||
196 | .eng_timeout = ata_eng_timeout, | ||
197 | |||
198 | .irq_handler = ata_interrupt, | 196 | .irq_handler = ata_interrupt, |
199 | .irq_clear = ata_bmdma_irq_clear, | 197 | .irq_clear = ata_bmdma_irq_clear, |
200 | 198 | ||
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 = { | |||
207 | 207 | ||
208 | .qc_prep = ata_qc_prep, | 208 | .qc_prep = ata_qc_prep, |
209 | .qc_issue = cs5530_qc_issue_prot, | 209 | .qc_issue = cs5530_qc_issue_prot, |
210 | .eng_timeout = ata_eng_timeout, | 210 | |
211 | .data_xfer = ata_pio_data_xfer, | 211 | .data_xfer = ata_pio_data_xfer, |
212 | 212 | ||
213 | .irq_handler = ata_interrupt, | 213 | .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 = { | |||
211 | 211 | ||
212 | .qc_prep = ata_qc_prep, | 212 | .qc_prep = ata_qc_prep, |
213 | .qc_issue = ata_qc_issue_prot, | 213 | .qc_issue = ata_qc_issue_prot, |
214 | .eng_timeout = ata_eng_timeout, | 214 | |
215 | .data_xfer = ata_pio_data_xfer, | 215 | .data_xfer = ata_pio_data_xfer, |
216 | 216 | ||
217 | .irq_handler = ata_interrupt, | 217 | .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 = { | |||
162 | 162 | ||
163 | .qc_prep = ata_qc_prep, | 163 | .qc_prep = ata_qc_prep, |
164 | .qc_issue = ata_qc_issue_prot, | 164 | .qc_issue = ata_qc_issue_prot, |
165 | .eng_timeout = ata_eng_timeout, | 165 | |
166 | .data_xfer = ata_pio_data_xfer, | 166 | .data_xfer = ata_pio_data_xfer, |
167 | 167 | ||
168 | .irq_handler = ata_interrupt, | 168 | .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 = { | |||
261 | .qc_issue = ata_qc_issue_prot, | 261 | .qc_issue = ata_qc_issue_prot, |
262 | .data_xfer = ata_pio_data_xfer, | 262 | .data_xfer = ata_pio_data_xfer, |
263 | 263 | ||
264 | .eng_timeout = ata_eng_timeout, | ||
265 | |||
266 | .irq_handler = ata_interrupt, | 264 | .irq_handler = ata_interrupt, |
267 | .irq_clear = ata_bmdma_irq_clear, | 265 | .irq_clear = ata_bmdma_irq_clear, |
268 | 266 | ||
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 = { | |||
360 | 360 | ||
361 | .qc_prep = ata_qc_prep, | 361 | .qc_prep = ata_qc_prep, |
362 | .qc_issue = ata_qc_issue_prot, | 362 | .qc_issue = ata_qc_issue_prot, |
363 | .eng_timeout = ata_eng_timeout, | 363 | |
364 | .data_xfer = ata_pio_data_xfer, | 364 | .data_xfer = ata_pio_data_xfer, |
365 | 365 | ||
366 | .irq_handler = ata_interrupt, | 366 | .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 = { | |||
793 | 793 | ||
794 | .qc_prep = ata_qc_prep, | 794 | .qc_prep = ata_qc_prep, |
795 | .qc_issue = ata_qc_issue_prot, | 795 | .qc_issue = ata_qc_issue_prot, |
796 | .eng_timeout = ata_eng_timeout, | 796 | |
797 | .data_xfer = ata_pio_data_xfer, | 797 | .data_xfer = ata_pio_data_xfer, |
798 | 798 | ||
799 | .irq_handler = ata_interrupt, | 799 | .irq_handler = ata_interrupt, |
@@ -832,7 +832,7 @@ static struct ata_port_operations hpt370a_port_ops = { | |||
832 | 832 | ||
833 | .qc_prep = ata_qc_prep, | 833 | .qc_prep = ata_qc_prep, |
834 | .qc_issue = ata_qc_issue_prot, | 834 | .qc_issue = ata_qc_issue_prot, |
835 | .eng_timeout = ata_eng_timeout, | 835 | |
836 | .data_xfer = ata_pio_data_xfer, | 836 | .data_xfer = ata_pio_data_xfer, |
837 | 837 | ||
838 | .irq_handler = ata_interrupt, | 838 | .irq_handler = ata_interrupt, |
@@ -872,7 +872,7 @@ static struct ata_port_operations hpt372_port_ops = { | |||
872 | 872 | ||
873 | .qc_prep = ata_qc_prep, | 873 | .qc_prep = ata_qc_prep, |
874 | .qc_issue = ata_qc_issue_prot, | 874 | .qc_issue = ata_qc_issue_prot, |
875 | .eng_timeout = ata_eng_timeout, | 875 | |
876 | .data_xfer = ata_pio_data_xfer, | 876 | .data_xfer = ata_pio_data_xfer, |
877 | 877 | ||
878 | .irq_handler = ata_interrupt, | 878 | .irq_handler = ata_interrupt, |
@@ -912,7 +912,7 @@ static struct ata_port_operations hpt374_port_ops = { | |||
912 | 912 | ||
913 | .qc_prep = ata_qc_prep, | 913 | .qc_prep = ata_qc_prep, |
914 | .qc_issue = ata_qc_issue_prot, | 914 | .qc_issue = ata_qc_issue_prot, |
915 | .eng_timeout = ata_eng_timeout, | 915 | |
916 | .data_xfer = ata_pio_data_xfer, | 916 | .data_xfer = ata_pio_data_xfer, |
917 | 917 | ||
918 | .irq_handler = ata_interrupt, | 918 | .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 = { | |||
372 | 372 | ||
373 | .qc_prep = ata_qc_prep, | 373 | .qc_prep = ata_qc_prep, |
374 | .qc_issue = hpt3x2n_qc_issue_prot, | 374 | .qc_issue = hpt3x2n_qc_issue_prot, |
375 | .eng_timeout = ata_eng_timeout, | 375 | |
376 | .data_xfer = ata_pio_data_xfer, | 376 | .data_xfer = ata_pio_data_xfer, |
377 | 377 | ||
378 | .irq_handler = ata_interrupt, | 378 | .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 = { | |||
145 | 145 | ||
146 | .qc_prep = ata_qc_prep, | 146 | .qc_prep = ata_qc_prep, |
147 | .qc_issue = ata_qc_issue_prot, | 147 | .qc_issue = ata_qc_issue_prot, |
148 | .eng_timeout = ata_eng_timeout, | 148 | |
149 | .data_xfer = ata_pio_data_xfer, | 149 | .data_xfer = ata_pio_data_xfer, |
150 | 150 | ||
151 | .irq_handler = ata_interrupt, | 151 | .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 = { | |||
52 | 52 | ||
53 | .qc_prep = ata_qc_prep, | 53 | .qc_prep = ata_qc_prep, |
54 | .qc_issue = ata_qc_issue_prot, | 54 | .qc_issue = ata_qc_issue_prot, |
55 | .eng_timeout = ata_eng_timeout, | 55 | |
56 | .data_xfer = ata_pio_data_xfer, | 56 | .data_xfer = ata_pio_data_xfer, |
57 | 57 | ||
58 | .irq_handler = ata_interrupt, | 58 | .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 = { | |||
703 | 703 | ||
704 | .qc_prep = ata_qc_prep, | 704 | .qc_prep = ata_qc_prep, |
705 | .qc_issue = it821x_smart_qc_issue_prot, | 705 | .qc_issue = it821x_smart_qc_issue_prot, |
706 | .eng_timeout = ata_eng_timeout, | 706 | |
707 | .data_xfer = ata_pio_data_xfer, | 707 | .data_xfer = ata_pio_data_xfer, |
708 | 708 | ||
709 | .irq_handler = ata_interrupt, | 709 | .irq_handler = ata_interrupt, |
@@ -739,7 +739,7 @@ static struct ata_port_operations it821x_passthru_port_ops = { | |||
739 | 739 | ||
740 | .qc_prep = ata_qc_prep, | 740 | .qc_prep = ata_qc_prep, |
741 | .qc_issue = it821x_passthru_qc_issue_prot, | 741 | .qc_issue = it821x_passthru_qc_issue_prot, |
742 | .eng_timeout = ata_eng_timeout, | 742 | |
743 | .data_xfer = ata_pio_data_xfer, | 743 | .data_xfer = ata_pio_data_xfer, |
744 | 744 | ||
745 | .irq_clear = ata_bmdma_irq_clear, | 745 | .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 = { | |||
164 | .qc_issue = ata_qc_issue_prot, | 164 | .qc_issue = ata_qc_issue_prot, |
165 | .data_xfer = ata_pio_data_xfer, | 165 | .data_xfer = ata_pio_data_xfer, |
166 | 166 | ||
167 | /* Timeout handling. Special recovery hooks here */ | 167 | /* IRQ-related hooks */ |
168 | .eng_timeout = ata_eng_timeout, | ||
169 | .irq_handler = ata_interrupt, | 168 | .irq_handler = ata_interrupt, |
170 | .irq_clear = ata_bmdma_irq_clear, | 169 | .irq_clear = ata_bmdma_irq_clear, |
171 | 170 | ||
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 = { | |||
161 | 161 | ||
162 | .qc_prep = ata_qc_prep, | 162 | .qc_prep = ata_qc_prep, |
163 | .qc_issue = ata_qc_issue_prot, | 163 | .qc_issue = ata_qc_issue_prot, |
164 | .eng_timeout = ata_eng_timeout, | 164 | |
165 | .data_xfer = ata_pio_data_xfer_noirq, | 165 | .data_xfer = ata_pio_data_xfer_noirq, |
166 | 166 | ||
167 | .irq_handler = ata_interrupt, | 167 | .irq_handler = ata_interrupt, |
@@ -186,7 +186,7 @@ static struct ata_port_operations legacy_port_ops = { | |||
186 | 186 | ||
187 | .qc_prep = ata_qc_prep, | 187 | .qc_prep = ata_qc_prep, |
188 | .qc_issue = ata_qc_issue_prot, | 188 | .qc_issue = ata_qc_issue_prot, |
189 | .eng_timeout = ata_eng_timeout, | 189 | |
190 | .data_xfer = ata_pio_data_xfer_noirq, | 190 | .data_xfer = ata_pio_data_xfer_noirq, |
191 | 191 | ||
192 | .irq_handler = ata_interrupt, | 192 | .irq_handler = ata_interrupt, |
@@ -296,7 +296,7 @@ static struct ata_port_operations pdc20230_port_ops = { | |||
296 | 296 | ||
297 | .qc_prep = ata_qc_prep, | 297 | .qc_prep = ata_qc_prep, |
298 | .qc_issue = ata_qc_issue_prot, | 298 | .qc_issue = ata_qc_issue_prot, |
299 | .eng_timeout = ata_eng_timeout, | 299 | |
300 | .data_xfer = pdc_data_xfer_vlb, | 300 | .data_xfer = pdc_data_xfer_vlb, |
301 | 301 | ||
302 | .irq_handler = ata_interrupt, | 302 | .irq_handler = ata_interrupt, |
@@ -348,7 +348,7 @@ static struct ata_port_operations ht6560a_port_ops = { | |||
348 | 348 | ||
349 | .qc_prep = ata_qc_prep, | 349 | .qc_prep = ata_qc_prep, |
350 | .qc_issue = ata_qc_issue_prot, | 350 | .qc_issue = ata_qc_issue_prot, |
351 | .eng_timeout = ata_eng_timeout, | 351 | |
352 | .data_xfer = ata_pio_data_xfer, /* Check vlb/noirq */ | 352 | .data_xfer = ata_pio_data_xfer, /* Check vlb/noirq */ |
353 | 353 | ||
354 | .irq_handler = ata_interrupt, | 354 | .irq_handler = ata_interrupt, |
@@ -411,7 +411,7 @@ static struct ata_port_operations ht6560b_port_ops = { | |||
411 | 411 | ||
412 | .qc_prep = ata_qc_prep, | 412 | .qc_prep = ata_qc_prep, |
413 | .qc_issue = ata_qc_issue_prot, | 413 | .qc_issue = ata_qc_issue_prot, |
414 | .eng_timeout = ata_eng_timeout, | 414 | |
415 | .data_xfer = ata_pio_data_xfer, /* FIXME: Check 32bit and noirq */ | 415 | .data_xfer = ata_pio_data_xfer, /* FIXME: Check 32bit and noirq */ |
416 | 416 | ||
417 | .irq_handler = ata_interrupt, | 417 | .irq_handler = ata_interrupt, |
@@ -529,7 +529,7 @@ static struct ata_port_operations opti82c611a_port_ops = { | |||
529 | 529 | ||
530 | .qc_prep = ata_qc_prep, | 530 | .qc_prep = ata_qc_prep, |
531 | .qc_issue = ata_qc_issue_prot, | 531 | .qc_issue = ata_qc_issue_prot, |
532 | .eng_timeout = ata_eng_timeout, | 532 | |
533 | .data_xfer = ata_pio_data_xfer, | 533 | .data_xfer = ata_pio_data_xfer, |
534 | 534 | ||
535 | .irq_handler = ata_interrupt, | 535 | .irq_handler = ata_interrupt, |
@@ -659,7 +659,7 @@ static struct ata_port_operations opti82c46x_port_ops = { | |||
659 | 659 | ||
660 | .qc_prep = ata_qc_prep, | 660 | .qc_prep = ata_qc_prep, |
661 | .qc_issue = opti82c46x_qc_issue_prot, | 661 | .qc_issue = opti82c46x_qc_issue_prot, |
662 | .eng_timeout = ata_eng_timeout, | 662 | |
663 | .data_xfer = ata_pio_data_xfer, | 663 | .data_xfer = ata_pio_data_xfer, |
664 | 664 | ||
665 | .irq_handler = ata_interrupt, | 665 | .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 = { | |||
90 | .qc_issue = ata_qc_issue_prot, | 90 | .qc_issue = ata_qc_issue_prot, |
91 | .data_xfer = ata_pio_data_xfer, | 91 | .data_xfer = ata_pio_data_xfer, |
92 | 92 | ||
93 | /* Timeout handling. Special recovery hooks here */ | 93 | /* IRQ-related hooks */ |
94 | .eng_timeout = ata_eng_timeout, | ||
95 | .irq_handler = ata_interrupt, | 94 | .irq_handler = ata_interrupt, |
96 | .irq_clear = ata_bmdma_irq_clear, | 95 | .irq_clear = ata_bmdma_irq_clear, |
97 | 96 | ||
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 = { | |||
176 | 176 | ||
177 | .qc_prep = ata_qc_prep, | 177 | .qc_prep = ata_qc_prep, |
178 | .qc_issue = ns87410_qc_issue_prot, | 178 | .qc_issue = ns87410_qc_issue_prot, |
179 | .eng_timeout = ata_eng_timeout, | 179 | |
180 | .data_xfer = ata_pio_data_xfer, | 180 | .data_xfer = ata_pio_data_xfer, |
181 | 181 | ||
182 | .irq_handler = ata_interrupt, | 182 | .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 = { | |||
227 | 227 | ||
228 | .qc_prep = ata_qc_prep, | 228 | .qc_prep = ata_qc_prep, |
229 | .qc_issue = ata_qc_issue_prot, | 229 | .qc_issue = ata_qc_issue_prot, |
230 | .eng_timeout = ata_eng_timeout, | 230 | |
231 | .data_xfer = ata_pio_data_xfer, | 231 | .data_xfer = ata_pio_data_xfer, |
232 | 232 | ||
233 | .irq_handler = ata_interrupt, | 233 | .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 = { | |||
386 | 386 | ||
387 | .qc_prep = ata_qc_prep, | 387 | .qc_prep = ata_qc_prep, |
388 | .qc_issue = ata_qc_issue_prot, | 388 | .qc_issue = ata_qc_issue_prot, |
389 | .eng_timeout = ata_eng_timeout, | 389 | |
390 | .data_xfer = ata_pio_data_xfer, | 390 | .data_xfer = ata_pio_data_xfer, |
391 | 391 | ||
392 | .irq_handler = ata_interrupt, | 392 | .irq_handler = ata_interrupt, |
@@ -421,7 +421,7 @@ static struct ata_port_operations optiplus_port_ops = { | |||
421 | 421 | ||
422 | .qc_prep = ata_qc_prep, | 422 | .qc_prep = ata_qc_prep, |
423 | .qc_issue = ata_qc_issue_prot, | 423 | .qc_issue = ata_qc_issue_prot, |
424 | .eng_timeout = ata_eng_timeout, | 424 | |
425 | .data_xfer = ata_pio_data_xfer, | 425 | .data_xfer = ata_pio_data_xfer, |
426 | 426 | ||
427 | .irq_handler = ata_interrupt, | 427 | .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 = { | |||
87 | 87 | ||
88 | .qc_prep = ata_qc_prep, | 88 | .qc_prep = ata_qc_prep, |
89 | .qc_issue = ata_qc_issue_prot, | 89 | .qc_issue = ata_qc_issue_prot, |
90 | .eng_timeout = ata_eng_timeout, | 90 | |
91 | .data_xfer = ata_pio_data_xfer_noirq, | 91 | .data_xfer = ata_pio_data_xfer_noirq, |
92 | 92 | ||
93 | .irq_handler = ata_interrupt, | 93 | .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 = { | |||
184 | 184 | ||
185 | .qc_prep = ata_qc_prep, | 185 | .qc_prep = ata_qc_prep, |
186 | .qc_issue = qdi_qc_issue_prot, | 186 | .qc_issue = qdi_qc_issue_prot, |
187 | .eng_timeout = ata_eng_timeout, | 187 | |
188 | .data_xfer = qdi_data_xfer, | 188 | .data_xfer = qdi_data_xfer, |
189 | 189 | ||
190 | .irq_handler = ata_interrupt, | 190 | .irq_handler = ata_interrupt, |
@@ -212,7 +212,7 @@ static struct ata_port_operations qdi6580_port_ops = { | |||
212 | 212 | ||
213 | .qc_prep = ata_qc_prep, | 213 | .qc_prep = ata_qc_prep, |
214 | .qc_issue = qdi_qc_issue_prot, | 214 | .qc_issue = qdi_qc_issue_prot, |
215 | .eng_timeout = ata_eng_timeout, | 215 | |
216 | .data_xfer = qdi_data_xfer, | 216 | .data_xfer = qdi_data_xfer, |
217 | 217 | ||
218 | .irq_handler = ata_interrupt, | 218 | .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 = { | |||
255 | .qc_issue = radisys_qc_issue_prot, | 255 | .qc_issue = radisys_qc_issue_prot, |
256 | .data_xfer = ata_pio_data_xfer, | 256 | .data_xfer = ata_pio_data_xfer, |
257 | 257 | ||
258 | .eng_timeout = ata_eng_timeout, | ||
259 | |||
260 | .irq_handler = ata_interrupt, | 258 | .irq_handler = ata_interrupt, |
261 | .irq_clear = ata_bmdma_irq_clear, | 259 | .irq_clear = ata_bmdma_irq_clear, |
262 | 260 | ||
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 = { | |||
112 | 112 | ||
113 | .qc_prep = ata_qc_prep, | 113 | .qc_prep = ata_qc_prep, |
114 | .qc_issue = ata_qc_issue_prot, | 114 | .qc_issue = ata_qc_issue_prot, |
115 | .eng_timeout = ata_eng_timeout, | 115 | |
116 | .data_xfer = ata_pio_data_xfer, | 116 | .data_xfer = ata_pio_data_xfer, |
117 | 117 | ||
118 | .freeze = ata_bmdma_freeze, | 118 | .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 = { | |||
217 | 217 | ||
218 | .qc_prep = ata_qc_prep, | 218 | .qc_prep = ata_qc_prep, |
219 | .qc_issue = sc1200_qc_issue_prot, | 219 | .qc_issue = sc1200_qc_issue_prot, |
220 | .eng_timeout = ata_eng_timeout, | 220 | |
221 | .data_xfer = ata_pio_data_xfer, | 221 | .data_xfer = ata_pio_data_xfer, |
222 | 222 | ||
223 | .irq_handler = ata_interrupt, | 223 | .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 = { | |||
352 | 352 | ||
353 | .qc_prep = ata_qc_prep, | 353 | .qc_prep = ata_qc_prep, |
354 | .qc_issue = ata_qc_issue_prot, | 354 | .qc_issue = ata_qc_issue_prot, |
355 | .eng_timeout = ata_eng_timeout, | 355 | |
356 | .data_xfer = ata_pio_data_xfer, | 356 | .data_xfer = ata_pio_data_xfer, |
357 | 357 | ||
358 | .irq_handler = ata_interrupt, | 358 | .irq_handler = ata_interrupt, |
@@ -387,7 +387,7 @@ static struct ata_port_operations serverworks_csb_port_ops = { | |||
387 | 387 | ||
388 | .qc_prep = ata_qc_prep, | 388 | .qc_prep = ata_qc_prep, |
389 | .qc_issue = ata_qc_issue_prot, | 389 | .qc_issue = ata_qc_issue_prot, |
390 | .eng_timeout = ata_eng_timeout, | 390 | |
391 | .data_xfer = ata_pio_data_xfer, | 391 | .data_xfer = ata_pio_data_xfer, |
392 | 392 | ||
393 | .irq_handler = ata_interrupt, | 393 | .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 = { | |||
251 | 251 | ||
252 | .qc_prep = ata_qc_prep, | 252 | .qc_prep = ata_qc_prep, |
253 | .qc_issue = ata_qc_issue_prot, | 253 | .qc_issue = ata_qc_issue_prot, |
254 | .eng_timeout = ata_eng_timeout, | 254 | |
255 | .data_xfer = ata_pio_data_xfer, | 255 | .data_xfer = ata_pio_data_xfer, |
256 | 256 | ||
257 | .irq_handler = ata_interrupt, | 257 | .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 = { | |||
573 | .qc_issue = ata_qc_issue_prot, | 573 | .qc_issue = ata_qc_issue_prot, |
574 | .data_xfer = ata_pio_data_xfer, | 574 | .data_xfer = ata_pio_data_xfer, |
575 | 575 | ||
576 | .eng_timeout = ata_eng_timeout, | ||
577 | |||
578 | .irq_handler = ata_interrupt, | 576 | .irq_handler = ata_interrupt, |
579 | .irq_clear = ata_bmdma_irq_clear, | 577 | .irq_clear = ata_bmdma_irq_clear, |
580 | 578 | ||
@@ -608,8 +606,6 @@ static const struct ata_port_operations sis_133_early_ops = { | |||
608 | .qc_issue = ata_qc_issue_prot, | 606 | .qc_issue = ata_qc_issue_prot, |
609 | .data_xfer = ata_pio_data_xfer, | 607 | .data_xfer = ata_pio_data_xfer, |
610 | 608 | ||
611 | .eng_timeout = ata_eng_timeout, | ||
612 | |||
613 | .irq_handler = ata_interrupt, | 609 | .irq_handler = ata_interrupt, |
614 | .irq_clear = ata_bmdma_irq_clear, | 610 | .irq_clear = ata_bmdma_irq_clear, |
615 | 611 | ||
@@ -644,8 +640,6 @@ static const struct ata_port_operations sis_100_ops = { | |||
644 | .qc_issue = ata_qc_issue_prot, | 640 | .qc_issue = ata_qc_issue_prot, |
645 | .data_xfer = ata_pio_data_xfer, | 641 | .data_xfer = ata_pio_data_xfer, |
646 | 642 | ||
647 | .eng_timeout = ata_eng_timeout, | ||
648 | |||
649 | .irq_handler = ata_interrupt, | 643 | .irq_handler = ata_interrupt, |
650 | .irq_clear = ata_bmdma_irq_clear, | 644 | .irq_clear = ata_bmdma_irq_clear, |
651 | 645 | ||
@@ -679,8 +673,6 @@ static const struct ata_port_operations sis_66_ops = { | |||
679 | .qc_issue = ata_qc_issue_prot, | 673 | .qc_issue = ata_qc_issue_prot, |
680 | .data_xfer = ata_pio_data_xfer, | 674 | .data_xfer = ata_pio_data_xfer, |
681 | 675 | ||
682 | .eng_timeout = ata_eng_timeout, | ||
683 | |||
684 | .irq_handler = ata_interrupt, | 676 | .irq_handler = ata_interrupt, |
685 | .irq_clear = ata_bmdma_irq_clear, | 677 | .irq_clear = ata_bmdma_irq_clear, |
686 | 678 | ||
@@ -714,8 +706,6 @@ static const struct ata_port_operations sis_old_ops = { | |||
714 | .qc_issue = ata_qc_issue_prot, | 706 | .qc_issue = ata_qc_issue_prot, |
715 | .data_xfer = ata_pio_data_xfer, | 707 | .data_xfer = ata_pio_data_xfer, |
716 | 708 | ||
717 | .eng_timeout = ata_eng_timeout, | ||
718 | |||
719 | .irq_handler = ata_interrupt, | 709 | .irq_handler = ata_interrupt, |
720 | .irq_clear = ata_bmdma_irq_clear, | 710 | .irq_clear = ata_bmdma_irq_clear, |
721 | 711 | ||
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 = { | |||
261 | 261 | ||
262 | .qc_prep = ata_qc_prep, | 262 | .qc_prep = ata_qc_prep, |
263 | .qc_issue = ata_qc_issue_prot, | 263 | .qc_issue = ata_qc_issue_prot, |
264 | .eng_timeout = ata_eng_timeout, | 264 | |
265 | .data_xfer = ata_pio_data_xfer, | 265 | .data_xfer = ata_pio_data_xfer, |
266 | 266 | ||
267 | .irq_handler = ata_interrupt, | 267 | .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 = { | |||
218 | 218 | ||
219 | .qc_prep = ata_qc_prep, | 219 | .qc_prep = ata_qc_prep, |
220 | .qc_issue = ata_qc_issue_prot, | 220 | .qc_issue = ata_qc_issue_prot, |
221 | .eng_timeout = ata_eng_timeout, | 221 | |
222 | .data_xfer = ata_pio_data_xfer, | 222 | .data_xfer = ata_pio_data_xfer, |
223 | 223 | ||
224 | .irq_handler = ata_interrupt, | 224 | .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 = { | |||
322 | 322 | ||
323 | .qc_prep = ata_qc_prep, | 323 | .qc_prep = ata_qc_prep, |
324 | .qc_issue = ata_qc_issue_prot, | 324 | .qc_issue = ata_qc_issue_prot, |
325 | .eng_timeout = ata_eng_timeout, | 325 | |
326 | .data_xfer = ata_pio_data_xfer, | 326 | .data_xfer = ata_pio_data_xfer, |
327 | 327 | ||
328 | .irq_handler = ata_interrupt, | 328 | .irq_handler = ata_interrupt, |
@@ -357,7 +357,7 @@ static struct ata_port_operations via_port_ops_noirq = { | |||
357 | 357 | ||
358 | .qc_prep = ata_qc_prep, | 358 | .qc_prep = ata_qc_prep, |
359 | .qc_issue = ata_qc_issue_prot, | 359 | .qc_issue = ata_qc_issue_prot, |
360 | .eng_timeout = ata_eng_timeout, | 360 | |
361 | .data_xfer = ata_pio_data_xfer_noirq, | 361 | .data_xfer = ata_pio_data_xfer_noirq, |
362 | 362 | ||
363 | .irq_handler = ata_interrupt, | 363 | .irq_handler = ata_interrupt, |