libata-dev: pata_pdc2027x minor fix for new EH
PATCH 1/2 libata-dev: pata_pdc2027x minor fix for new EH
Changes:
- move the function pointers around for better grouping
- remove the unused ->eng_timeout()
- add ->freeze(), ->thaw() and ->post_internal_cmd() for UDMA133 pdc adapters.
Signed-off-by Albert Lee <[email protected]>
---
Patch against the pata-drivers branch (0ab56aae451577586ecac6968d86251a83f1cb40) (0.74-ac3). For your review, thanks.
drivers/scsi/pata_pdc2027x.c +11 -10
@@ -154,11 +154,6 @@ static struct ata_port_operations pdc202 .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = pdc2027x_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .check_atapi_dma = pdc2027x_check_atapi_dma, .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start,
@@ -166,9 +161,13 @@ static struct ata_port_operations pdc202 .bmdma_status = ata_bmdma_status, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, - .eng_timeout = ata_eng_timeout, .data_xfer = ata_mmio_data_xfer, + .freeze = ata_bmdma_freeze, + .thaw = ata_bmdma_thaw, + .error_handler = pdc2027x_error_handler, + .post_internal_cmd = ata_bmdma_post_internal_cmd, + .irq_handler = ata_interrupt, .irq_clear = ata_bmdma_irq_clear,
@@ -181,6 +180,7 @@ static struct ata_port_operations pdc202 .port_disable = ata_port_disable, .set_piomode = pdc2027x_set_piomode, .set_dmamode = pdc2027x_set_dmamode, + .post_set_mode = pdc2027x_post_set_mode, .tf_load = ata_tf_load, .tf_read = ata_tf_read,
@@ -188,9 +188,6 @@ static struct ata_port_operations pdc202 .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .error_handler = pdc2027x_error_handler, - .post_set_mode = pdc2027x_post_set_mode, - .check_atapi_dma = pdc2027x_check_atapi_dma, .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start,
@@ -198,9 +195,13 @@ static struct ata_port_operations pdc202 .bmdma_status = ata_bmdma_status, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, - .eng_timeout = ata_eng_timeout, .data_xfer = ata_mmio_data_xfer, + .freeze = ata_bmdma_freeze, + .thaw = ata_bmdma_thaw, + .error_handler = pdc2027x_error_handler, + .post_internal_cmd = ata_bmdma_post_internal_cmd, + .irq_handler = ata_interrupt, .irq_clear = ata_bmdma_irq_clear,