diff options
Diffstat (limited to 'drivers/ata/sata_mv.c')
-rw-r--r-- | drivers/ata/sata_mv.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index a4944c8ad46d..b3b3da4eaa03 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -461,7 +461,6 @@ struct mv_hw_ops { | |||
461 | void (*reset_bus)(struct ata_host *host, void __iomem *mmio); | 461 | void (*reset_bus)(struct ata_host *host, void __iomem *mmio); |
462 | }; | 462 | }; |
463 | 463 | ||
464 | static void mv_irq_clear(struct ata_port *ap); | ||
465 | static int mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val); | 464 | static int mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val); |
466 | static int mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val); | 465 | static int mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val); |
467 | static int mv5_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val); | 466 | static int mv5_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val); |
@@ -564,7 +563,7 @@ static const struct ata_port_operations mv5_ops = { | |||
564 | .qc_issue = mv_qc_issue, | 563 | .qc_issue = mv_qc_issue, |
565 | .data_xfer = ata_data_xfer, | 564 | .data_xfer = ata_data_xfer, |
566 | 565 | ||
567 | .irq_clear = mv_irq_clear, | 566 | .irq_clear = ata_noop_irq_clear, |
568 | .irq_on = ata_irq_on, | 567 | .irq_on = ata_irq_on, |
569 | 568 | ||
570 | .error_handler = mv_error_handler, | 569 | .error_handler = mv_error_handler, |
@@ -592,7 +591,7 @@ static const struct ata_port_operations mv6_ops = { | |||
592 | .qc_issue = mv_qc_issue, | 591 | .qc_issue = mv_qc_issue, |
593 | .data_xfer = ata_data_xfer, | 592 | .data_xfer = ata_data_xfer, |
594 | 593 | ||
595 | .irq_clear = mv_irq_clear, | 594 | .irq_clear = ata_noop_irq_clear, |
596 | .irq_on = ata_irq_on, | 595 | .irq_on = ata_irq_on, |
597 | 596 | ||
598 | .error_handler = mv_error_handler, | 597 | .error_handler = mv_error_handler, |
@@ -620,7 +619,7 @@ static const struct ata_port_operations mv_iie_ops = { | |||
620 | .qc_issue = mv_qc_issue, | 619 | .qc_issue = mv_qc_issue, |
621 | .data_xfer = ata_data_xfer, | 620 | .data_xfer = ata_data_xfer, |
622 | 621 | ||
623 | .irq_clear = mv_irq_clear, | 622 | .irq_clear = ata_noop_irq_clear, |
624 | .irq_on = ata_irq_on, | 623 | .irq_on = ata_irq_on, |
625 | 624 | ||
626 | .error_handler = mv_error_handler, | 625 | .error_handler = mv_error_handler, |
@@ -801,10 +800,6 @@ static inline int mv_get_hc_count(unsigned long port_flags) | |||
801 | return ((port_flags & MV_FLAG_DUAL_HC) ? 2 : 1); | 800 | return ((port_flags & MV_FLAG_DUAL_HC) ? 2 : 1); |
802 | } | 801 | } |
803 | 802 | ||
804 | static void mv_irq_clear(struct ata_port *ap) | ||
805 | { | ||
806 | } | ||
807 | |||
808 | static void mv_set_edma_ptrs(void __iomem *port_mmio, | 803 | static void mv_set_edma_ptrs(void __iomem *port_mmio, |
809 | struct mv_host_priv *hpriv, | 804 | struct mv_host_priv *hpriv, |
810 | struct mv_port_priv *pp) | 805 | struct mv_port_priv *pp) |