diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-03-02 18:09:05 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-03-02 18:09:05 -0500 |
commit | bf7551c441d4b7b0de867d21b96881f3911e89b0 (patch) | |
tree | 51f024698c9972060077a9e4eea6661f0e67fef1 | |
parent | f31f0cc2f0b7527072d94d02da332d9bb8d7d94c (diff) |
[libata] pata_{legacy,sc1200,sl82c105}: add missing hooks
Alan Cox noticed several hooks in pata_* drivers were missing, when
he authored his ->cable_detect hook patches. This patch extracts
just those fixes from Alan's patches, adding the necessary hooks
(usually ->freeze, ->thaw, and ->post_internal_cmd) to the drivers.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/ata/pata_legacy.c | 18 | ||||
-rw-r--r-- | drivers/ata/pata_sc1200.c | 3 | ||||
-rw-r--r-- | drivers/ata/pata_sl82c105.c | 3 |
3 files changed, 24 insertions, 0 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index 6ee61c67163a..fc5b73d78e00 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c | |||
@@ -186,7 +186,10 @@ static struct ata_port_operations legacy_port_ops = { | |||
186 | .exec_command = ata_exec_command, | 186 | .exec_command = ata_exec_command, |
187 | .dev_select = ata_std_dev_select, | 187 | .dev_select = ata_std_dev_select, |
188 | 188 | ||
189 | .freeze = ata_bmdma_freeze, | ||
190 | .thaw = ata_bmdma_thaw, | ||
189 | .error_handler = ata_bmdma_error_handler, | 191 | .error_handler = ata_bmdma_error_handler, |
192 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
190 | 193 | ||
191 | .qc_prep = ata_qc_prep, | 194 | .qc_prep = ata_qc_prep, |
192 | .qc_issue = ata_qc_issue_prot, | 195 | .qc_issue = ata_qc_issue_prot, |
@@ -298,7 +301,10 @@ static struct ata_port_operations pdc20230_port_ops = { | |||
298 | .exec_command = ata_exec_command, | 301 | .exec_command = ata_exec_command, |
299 | .dev_select = ata_std_dev_select, | 302 | .dev_select = ata_std_dev_select, |
300 | 303 | ||
304 | .freeze = ata_bmdma_freeze, | ||
305 | .thaw = ata_bmdma_thaw, | ||
301 | .error_handler = ata_bmdma_error_handler, | 306 | .error_handler = ata_bmdma_error_handler, |
307 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
302 | 308 | ||
303 | .qc_prep = ata_qc_prep, | 309 | .qc_prep = ata_qc_prep, |
304 | .qc_issue = ata_qc_issue_prot, | 310 | .qc_issue = ata_qc_issue_prot, |
@@ -350,7 +356,10 @@ static struct ata_port_operations ht6560a_port_ops = { | |||
350 | .exec_command = ata_exec_command, | 356 | .exec_command = ata_exec_command, |
351 | .dev_select = ata_std_dev_select, | 357 | .dev_select = ata_std_dev_select, |
352 | 358 | ||
359 | .freeze = ata_bmdma_freeze, | ||
360 | .thaw = ata_bmdma_thaw, | ||
353 | .error_handler = ata_bmdma_error_handler, | 361 | .error_handler = ata_bmdma_error_handler, |
362 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
354 | 363 | ||
355 | .qc_prep = ata_qc_prep, | 364 | .qc_prep = ata_qc_prep, |
356 | .qc_issue = ata_qc_issue_prot, | 365 | .qc_issue = ata_qc_issue_prot, |
@@ -413,7 +422,10 @@ static struct ata_port_operations ht6560b_port_ops = { | |||
413 | .exec_command = ata_exec_command, | 422 | .exec_command = ata_exec_command, |
414 | .dev_select = ata_std_dev_select, | 423 | .dev_select = ata_std_dev_select, |
415 | 424 | ||
425 | .freeze = ata_bmdma_freeze, | ||
426 | .thaw = ata_bmdma_thaw, | ||
416 | .error_handler = ata_bmdma_error_handler, | 427 | .error_handler = ata_bmdma_error_handler, |
428 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
417 | 429 | ||
418 | .qc_prep = ata_qc_prep, | 430 | .qc_prep = ata_qc_prep, |
419 | .qc_issue = ata_qc_issue_prot, | 431 | .qc_issue = ata_qc_issue_prot, |
@@ -531,7 +543,10 @@ static struct ata_port_operations opti82c611a_port_ops = { | |||
531 | .exec_command = ata_exec_command, | 543 | .exec_command = ata_exec_command, |
532 | .dev_select = ata_std_dev_select, | 544 | .dev_select = ata_std_dev_select, |
533 | 545 | ||
546 | .freeze = ata_bmdma_freeze, | ||
547 | .thaw = ata_bmdma_thaw, | ||
534 | .error_handler = ata_bmdma_error_handler, | 548 | .error_handler = ata_bmdma_error_handler, |
549 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
535 | 550 | ||
536 | .qc_prep = ata_qc_prep, | 551 | .qc_prep = ata_qc_prep, |
537 | .qc_issue = ata_qc_issue_prot, | 552 | .qc_issue = ata_qc_issue_prot, |
@@ -661,7 +676,10 @@ static struct ata_port_operations opti82c46x_port_ops = { | |||
661 | .exec_command = ata_exec_command, | 676 | .exec_command = ata_exec_command, |
662 | .dev_select = ata_std_dev_select, | 677 | .dev_select = ata_std_dev_select, |
663 | 678 | ||
679 | .freeze = ata_bmdma_freeze, | ||
680 | .thaw = ata_bmdma_thaw, | ||
664 | .error_handler = ata_bmdma_error_handler, | 681 | .error_handler = ata_bmdma_error_handler, |
682 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
665 | 683 | ||
666 | .qc_prep = ata_qc_prep, | 684 | .qc_prep = ata_qc_prep, |
667 | .qc_issue = opti82c46x_qc_issue_prot, | 685 | .qc_issue = opti82c46x_qc_issue_prot, |
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index 58e42fbd14f9..c94504b38b5e 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c | |||
@@ -210,7 +210,10 @@ static struct ata_port_operations sc1200_port_ops = { | |||
210 | .exec_command = ata_exec_command, | 210 | .exec_command = ata_exec_command, |
211 | .dev_select = ata_std_dev_select, | 211 | .dev_select = ata_std_dev_select, |
212 | 212 | ||
213 | .freeze = ata_bmdma_freeze, | ||
214 | .thaw = ata_bmdma_thaw, | ||
213 | .error_handler = ata_bmdma_error_handler, | 215 | .error_handler = ata_bmdma_error_handler, |
216 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
214 | 217 | ||
215 | .bmdma_setup = ata_bmdma_setup, | 218 | .bmdma_setup = ata_bmdma_setup, |
216 | .bmdma_start = ata_bmdma_start, | 219 | .bmdma_start = ata_bmdma_start, |
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c index 13e81f0ef1f7..b681441cfcb9 100644 --- a/drivers/ata/pata_sl82c105.c +++ b/drivers/ata/pata_sl82c105.c | |||
@@ -234,7 +234,10 @@ static struct ata_port_operations sl82c105_port_ops = { | |||
234 | .exec_command = ata_exec_command, | 234 | .exec_command = ata_exec_command, |
235 | .dev_select = ata_std_dev_select, | 235 | .dev_select = ata_std_dev_select, |
236 | 236 | ||
237 | .freeze = ata_bmdma_freeze, | ||
238 | .thaw = ata_bmdma_thaw, | ||
237 | .error_handler = sl82c105_error_handler, | 239 | .error_handler = sl82c105_error_handler, |
240 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
238 | 241 | ||
239 | .bmdma_setup = ata_bmdma_setup, | 242 | .bmdma_setup = ata_bmdma_setup, |
240 | .bmdma_start = sl82c105_bmdma_start, | 243 | .bmdma_start = sl82c105_bmdma_start, |