[libata] Remove ->irq_ack() hook, and ata_dummy_irq_on()

* ->irq_ack() is redundant to what the irq handler already
  performs... chk-status + irq-clear.  Furthermore, it is only
  called in one place, when screaming-irq-debugging is enabled,
  so we don't want to bother with a hook just for that.

* ata_dummy_irq_on() is only ever used in drivers that have
  no callpath reaching ->irq_on().  Remove .irq_on hook from
  those drivers, and the now-unused ata_dummy_irq_on()

Signed-off-by: Jeff Garzik <jeff@garzik.org>

65 files changed, 2 insertions, 203 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index baf7d0562190..c888c966a020 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -276,8 +276,6 @@ static const struct ata_port_operations ahci_ops = {
         .qc_issue               = ahci_qc_issue,
 
         .irq_clear              = ahci_irq_clear,
-        .irq_on                 = ata_dummy_irq_on,
-        .irq_ack                = ata_dummy_irq_ack,
 
         .scr_read               = ahci_scr_read,
         .scr_write              = ahci_scr_write,
@@ -310,8 +308,6 @@ static const struct ata_port_operations ahci_vt8251_ops = {
         .qc_issue               = ahci_qc_issue,
 
         .irq_clear              = ahci_irq_clear,
-        .irq_on                 = ata_dummy_irq_on,
-        .irq_ack                = ata_dummy_irq_ack,
 
         .scr_read               = ahci_scr_read,
         .scr_write              = ahci_scr_write,
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index e390ad47c8ef..6ec1bbc4fcc4 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -121,7 +121,6 @@ static struct ata_port_operations generic_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 4b66b9e9638f..68bc0ae671c5 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -318,7 +318,6 @@ static const struct ata_port_operations piix_pata_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -352,7 +351,6 @@ static const struct ata_port_operations ich_pata_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -382,7 +380,6 @@ static const struct ata_port_operations piix_sata_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 9f87f7ddd485..4f8b8d210cf4 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5747,7 +5747,8 @@ idle_irq:
 
 #ifdef ATA_IRQ_TRAP
         if ((ap->stats.idle_irq % 1000) == 0) {
-                ap->ops->irq_ack(ap, 0); /* debug trap */
+                ata_chk_status(ap);
+                ap->ops->irq_clear(ap);
                 ata_port_printk(ap, KERN_WARNING, "irq trap\n");
                 return 1;
         }
@@ -7137,9 +7138,6 @@ EXPORT_SYMBOL_GPL(ata_eh_qc_complete);
 EXPORT_SYMBOL_GPL(ata_eh_qc_retry);
 EXPORT_SYMBOL_GPL(ata_do_eh);
 EXPORT_SYMBOL_GPL(ata_irq_on);
-EXPORT_SYMBOL_GPL(ata_dummy_irq_on);
-EXPORT_SYMBOL_GPL(ata_irq_ack);
-EXPORT_SYMBOL_GPL(ata_dummy_irq_ack);
 EXPORT_SYMBOL_GPL(ata_dev_try_classify);
 
 EXPORT_SYMBOL_GPL(ata_cable_40wire);
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index dd528dbd9ccf..ccef99a0337c 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -64,46 +64,6 @@ u8 ata_irq_on(struct ata_port *ap)
         return tmp;
 }
 
-u8 ata_dummy_irq_on (struct ata_port *ap)       { return 0; }
-
-/**
- *      ata_irq_ack - Acknowledge a device interrupt.
- *      @ap: Port on which interrupts are enabled.
- *
- *      Wait up to 10 ms for legacy IDE device to become idle (BUSY
- *      or BUSY+DRQ clear).  Obtain dma status and port status from
- *      device.  Clear the interrupt.  Return port status.
- *
- *      LOCKING:
- */
-
-u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)
-{
-        unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
-        u8 host_stat = 0, post_stat = 0, status;
-
-        status = ata_busy_wait(ap, bits, 1000);
-        if (status & bits)
-                if (ata_msg_err(ap))
-                        printk(KERN_ERR "abnormal status 0x%X\n", status);
-
-        if (ap->ioaddr.bmdma_addr) {
-                /* get controller status; clear intr, err bits */
-                host_stat = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
-                iowrite8(host_stat | ATA_DMA_INTR | ATA_DMA_ERR,
-                         ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
-
-                post_stat = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
-        }
-        if (ata_msg_intr(ap))
-                printk(KERN_INFO "%s: irq ack: host_stat 0x%X, new host_stat 0x%X, drv_stat 0x%X\n",
-                        __FUNCTION__,
-                        host_stat, post_stat, status);
-        return status;
-}
-
-u8 ata_dummy_irq_ack(struct ata_port *ap, unsigned int chk_drq) { return 0; }
-
 /**
  *      ata_tf_load - send taskfile registers to host controller
  *      @ap: Port to which output is sent
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 32a10c99c06f..9436c4963929 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -327,7 +327,6 @@ static struct ata_port_operations ali_early_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -369,7 +368,6 @@ static struct ata_port_operations ali_20_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -408,7 +406,6 @@ static struct ata_port_operations ali_c2_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -446,7 +443,6 @@ static struct ata_port_operations ali_c5_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index d0cebe16a8ee..46f829c838b3 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -358,7 +358,6 @@ static struct ata_port_operations amd33_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -393,7 +392,6 @@ static struct ata_port_operations amd66_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -428,7 +426,6 @@ static struct ata_port_operations amd100_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -463,7 +460,6 @@ static struct ata_port_operations amd133_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -498,7 +494,6 @@ static struct ata_port_operations nv100_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -533,7 +528,6 @@ static struct ata_port_operations nv133_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 361f2fca7e54..8c864353596e 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -361,7 +361,6 @@ static const struct ata_port_operations artop6210_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -394,7 +393,6 @@ static const struct ata_port_operations artop6260_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 656f4d0a5728..f2bfdeb44023 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -262,7 +262,6 @@ static struct ata_port_operations atiixp_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 0feb5ae8c486..a292ed97246d 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -213,7 +213,6 @@ static struct ata_port_operations cmd640_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = cmd640_port_start,
 };
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 922902a1b4ae..d308c4644647 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -313,7 +313,6 @@ static struct ata_port_operations cmd64x_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -348,7 +347,6 @@ static struct ata_port_operations cmd646r1_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -383,7 +381,6 @@ static struct ata_port_operations cmd648_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index e2459088cdcd..300dcff949e2 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -184,7 +184,6 @@ static struct ata_port_operations cs5520_port_ops = {
 
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index eaaea848b649..2b770072f392 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -209,7 +209,6 @@ static struct ata_port_operations cs5530_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 360b6f32e17e..94b1a9caf3cb 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -206,7 +206,6 @@ static struct ata_port_operations cs5535_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 6cbc8778bf4f..8c439a9bb5dd 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -158,7 +158,6 @@ static struct ata_port_operations cy82c693_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 9f6fae6e38bf..4d646ffb257b 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -279,7 +279,6 @@ static const struct ata_port_operations efar_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 6f7d34ad19ef..508d1cab52d1 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -342,7 +342,6 @@ static struct ata_port_operations hpt366_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 1a4d0ad68d18..896e6e31c67f 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -673,7 +673,6 @@ static struct ata_port_operations hpt370_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -712,7 +711,6 @@ static struct ata_port_operations hpt370a_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -752,7 +750,6 @@ static struct ata_port_operations hpt372_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -792,7 +789,6 @@ static struct ata_port_operations hpt374_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index 739a89180eb9..2b7f099ac785 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -391,7 +391,6 @@ static struct ata_port_operations hpt3x2n_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index be0f05efac6d..a2f81f40d7ac 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -153,7 +153,6 @@ static struct ata_port_operations hpt3x3_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index 64a711776c45..ffcccfc0b9d4 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -357,23 +357,6 @@ static void pata_icside_error_handler(struct ata_port *ap)
                            pata_icside_postreset);
 }
 
-static u8 pata_icside_irq_ack(struct ata_port *ap, unsigned int chk_drq)
-{
-        unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
-        u8 status;
-
-        status = ata_busy_wait(ap, bits, 1000);
-        if (status & bits)
-                if (ata_msg_err(ap))
-                        printk(KERN_ERR "abnormal status 0x%X\n", status);
-
-        if (ata_msg_intr(ap))
-                printk(KERN_INFO "%s: irq ack: drv_stat 0x%X\n",
-                        __FUNCTION__, status);
-
-        return status;
-}
-
 static struct ata_port_operations pata_icside_port_ops = {
         .port_disable           = ata_port_disable,
 
@@ -403,7 +386,6 @@ static struct ata_port_operations pata_icside_port_ops = {
 
         .irq_clear              = ata_dummy_noret,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = pata_icside_irq_ack,
 
         .port_start             = pata_icside_port_start,
 
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 9e553c54203a..b8d6d5c43537 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -58,7 +58,6 @@ static struct ata_port_operations isapnp_port_ops = {
 
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
index 1daf1e19bdfc..8aae9d7171c1 100644
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -289,7 +289,6 @@ static const struct ata_port_operations it8213_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index f32d9b7ab496..0179b29c5156 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -650,7 +650,6 @@ static struct ata_port_operations it821x_smart_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = it821x_port_start,
 };
@@ -687,7 +686,6 @@ static struct ata_port_operations it821x_passthru_port_ops = {
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_handler    = ata_interrupt,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = it821x_port_start,
 };
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 6bf1709508ab..ce1f9b17ad32 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -127,7 +127,6 @@ static struct ata_port_operations ixp4xx_port_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_dummy_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 1619b86b74af..26f84063859d 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -168,7 +168,6 @@ static const struct ata_port_operations jmicron_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         /* Generic PATA PCI ATA helpers */
         .port_start             = ata_port_start,
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index cfb2bc86a1d1..6529d34f0370 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -171,7 +171,6 @@ static struct ata_port_operations simple_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -200,7 +199,6 @@ static struct ata_port_operations legacy_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -316,7 +314,6 @@ static struct ata_port_operations pdc20230_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -372,7 +369,6 @@ static struct ata_port_operations ht6560a_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -439,7 +435,6 @@ static struct ata_port_operations ht6560b_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -561,7 +556,6 @@ static struct ata_port_operations opti82c611a_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -695,7 +689,6 @@ static struct ata_port_operations opti82c46x_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index b4dd18f3fa5d..021d9d9218bd 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -139,7 +139,6 @@ static const struct ata_port_operations marvell_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         /* Generic PATA PCI ATA helpers */
         .port_start             = ata_port_start,
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 099f4cdc4cd9..6e3fac2fedc4 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -299,7 +299,6 @@ static struct ata_port_operations mpc52xx_ata_port_ops = {
         .data_xfer              = ata_data_xfer,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .port_start             = ata_port_start,
 };
 
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 36c964b9e7da..8a82fcd4fa31 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -190,7 +190,6 @@ static struct ata_port_operations mpiix_port_ops = {
 
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index 40eb574828bf..2d64c58482fa 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -68,7 +68,6 @@ static const struct ata_port_operations netcell_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         /* Generic PATA PCI ATA helpers */
         .port_start             = ata_port_start,
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 65a217727718..00a763c67f99 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -185,7 +185,6 @@ static struct ata_port_operations ns87410_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 5b2c86fe9fc2..851dae960018 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -266,7 +266,6 @@ static const struct ata_port_operations oldpiix_pata_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index 5770c7755a62..0ab300cda9b7 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -210,7 +210,6 @@ static struct ata_port_operations opti_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 09ef725afd90..51c49283fb39 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -398,7 +398,6 @@ static struct ata_port_operations optidma_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -434,7 +433,6 @@ static struct ata_port_operations optiplus_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 9bfe12ac851a..f2167729c3df 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -127,7 +127,6 @@ static struct ata_port_operations pcmcia_port_ops = {
 
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_sff_port_start,
 };
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index db069d7515bc..7c6df320c833 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -173,7 +173,6 @@ static struct ata_port_operations pdc2027x_pata100_ops = {
 
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -208,7 +207,6 @@ static struct ata_port_operations pdc2027x_pata133_ops = {
 
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index 92447bed5e77..b03b33872457 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -275,7 +275,6 @@ static struct ata_port_operations pdc2024x_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -310,7 +309,6 @@ static struct ata_port_operations pdc2026x_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 9dc628931e99..a616616706da 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -89,7 +89,6 @@ static struct ata_port_operations pata_platform_port_ops = {
 
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_dummy_ret0,
 };
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index ec2206e820ac..ade5a4421663 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -192,7 +192,6 @@ static struct ata_port_operations qdi6500_port_ops = {
 
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -220,7 +219,6 @@ static struct ata_port_operations qdi6580_port_ops = {
 
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 7d1aabed422d..66b9a341931b 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -231,7 +231,6 @@ static const struct ata_port_operations radisys_pata_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index de3698cf3b8c..98784647c7e8 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -99,7 +99,6 @@ static struct ata_port_operations rz1000_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 5edf67b1f3bf..61edff4a5c6e 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -227,7 +227,6 @@ static struct ata_port_operations sc1200_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 63fe99a10cd1..95f04b81352f 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -839,38 +839,6 @@ static u8 scc_irq_on (struct ata_port *ap)
 }
 
 /**
- *      scc_irq_ack - Acknowledge a device interrupt.
- *      @ap: Port on which interrupts are enabled.
- *
- *      Note: Original code is ata_irq_ack().
- */
-
-static u8 scc_irq_ack (struct ata_port *ap, unsigned int chk_drq)
-{
-        unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
-        u8 host_stat, post_stat, status;
-
-        status = ata_busy_wait(ap, bits, 1000);
-        if (status & bits)
-                if (ata_msg_err(ap))
-                        printk(KERN_ERR "abnormal status 0x%X\n", status);
-
-        /* get controller status; clear intr, err bits */
-        host_stat = in_be32(ap->ioaddr.bmdma_addr + SCC_DMA_STATUS);
-        out_be32(ap->ioaddr.bmdma_addr + SCC_DMA_STATUS,
-                 host_stat | ATA_DMA_INTR | ATA_DMA_ERR);
-
-        post_stat = in_be32(ap->ioaddr.bmdma_addr + SCC_DMA_STATUS);
-
-        if (ata_msg_intr(ap))
-                printk(KERN_INFO "%s: irq ack: host_stat 0x%X, new host_stat 0x%X, drv_stat 0x%X\n",
-                       __FUNCTION__,
-                       host_stat, post_stat, status);
-
-        return status;
-}
-
-/**
  *      scc_bmdma_freeze - Freeze BMDMA controller port
  *      @ap: port to freeze
  *
@@ -1047,7 +1015,6 @@ static const struct ata_port_operations scc_pata_ops = {
 
         .irq_clear              = scc_bmdma_irq_clear,
         .irq_on                 = scc_irq_on,
-        .irq_ack                = scc_irq_ack,
 
         .port_start             = scc_port_start,
         .port_stop              = scc_port_stop,
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 0faf99c8f13e..c87cd67f4152 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -348,7 +348,6 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -384,7 +383,6 @@ static struct ata_port_operations serverworks_csb_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 45515a22d856..c5abf6616543 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -267,7 +267,6 @@ static struct ata_port_operations sil680_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index b72227676f00..72850667d371 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -559,7 +559,6 @@ static const struct ata_port_operations sis_133_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -593,7 +592,6 @@ static const struct ata_port_operations sis_133_for_sata_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -627,7 +625,6 @@ static const struct ata_port_operations sis_133_early_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -661,7 +658,6 @@ static const struct ata_port_operations sis_100_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -695,7 +691,6 @@ static const struct ata_port_operations sis_66_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -729,7 +724,6 @@ static const struct ata_port_operations sis_old_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 375c3705dc43..1c50c191e4bc 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -254,7 +254,6 @@ static struct ata_port_operations sl82c105_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index bc4b6f6be963..2a55eed45ad8 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -227,7 +227,6 @@ static struct ata_port_operations triflex_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index b612808a319e..4ddcae8b8c96 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -375,7 +375,6 @@ static struct ata_port_operations via_port_ops = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
@@ -411,7 +410,6 @@ static struct ata_port_operations via_port_ops_noirq = {
         .irq_handler    = ata_interrupt,
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index c37570330073..c1647da55543 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -160,7 +160,6 @@ static struct ata_port_operations winbond_port_ops = {
 
         .irq_clear      = ata_bmdma_irq_clear,
         .irq_on         = ata_irq_on,
-        .irq_ack        = ata_irq_ack,
 
         .port_start     = ata_port_start,
 };
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 304c19b9b0f2..7dd7361289c4 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -177,7 +177,6 @@ static const struct ata_port_operations adma_ata_ops = {
         .error_handler          = adma_error_handler,
         .irq_clear              = adma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .port_start             = adma_port_start,
         .port_stop              = adma_port_stop,
         .host_stop              = adma_host_stop,
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 95caba0f910e..d6a3e286c79d 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -569,7 +569,6 @@ static struct ata_port_operations inic_port_ops = {
 
         .irq_clear              = inic_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .qc_prep                = ata_qc_prep,
         .qc_issue               = inic_qc_issue,
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 56784ce10544..393fc655f8c1 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -499,7 +499,6 @@ static const struct ata_port_operations mv5_ops = {
 
         .irq_clear              = mv_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .error_handler          = mv_error_handler,
         .post_internal_cmd      = mv_post_int_cmd,
@@ -530,7 +529,6 @@ static const struct ata_port_operations mv6_ops = {
 
         .irq_clear              = mv_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .error_handler          = mv_error_handler,
         .post_internal_cmd      = mv_post_int_cmd,
@@ -561,7 +559,6 @@ static const struct ata_port_operations mv_iie_ops = {
 
         .irq_clear              = mv_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .error_handler          = mv_error_handler,
         .post_internal_cmd      = mv_post_int_cmd,
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 884d9f05e6c6..88ecca6343ea 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -359,7 +359,6 @@ static const struct ata_port_operations nv_generic_ops = {
         .data_xfer              = ata_data_xfer,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = nv_scr_read,
         .scr_write              = nv_scr_write,
         .port_start             = ata_port_start,
@@ -385,7 +384,6 @@ static const struct ata_port_operations nv_nf2_ops = {
         .data_xfer              = ata_data_xfer,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = nv_scr_read,
         .scr_write              = nv_scr_write,
         .port_start             = ata_port_start,
@@ -411,7 +409,6 @@ static const struct ata_port_operations nv_ck804_ops = {
         .data_xfer              = ata_data_xfer,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = nv_scr_read,
         .scr_write              = nv_scr_write,
         .port_start             = ata_port_start,
@@ -439,7 +436,6 @@ static const struct ata_port_operations nv_adma_ops = {
         .data_xfer              = ata_data_xfer,
         .irq_clear              = nv_adma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = nv_scr_read,
         .scr_write              = nv_scr_write,
         .port_start             = nv_adma_port_start,
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index c7238ce83541..37d737b442b5 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -185,7 +185,6 @@ static const struct ata_port_operations pdc_sata_ops = {
         .data_xfer              = ata_data_xfer,
         .irq_clear              = pdc_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .scr_read               = pdc_sata_scr_read,
         .scr_write              = pdc_sata_scr_write,
@@ -212,7 +211,6 @@ static const struct ata_port_operations pdc_old_sata_ops = {
         .data_xfer              = ata_data_xfer,
         .irq_clear              = pdc_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .scr_read               = pdc_sata_scr_read,
         .scr_write              = pdc_sata_scr_write,
@@ -238,7 +236,6 @@ static const struct ata_port_operations pdc_pata_ops = {
         .data_xfer              = ata_data_xfer,
         .irq_clear              = pdc_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = pdc_common_port_start,
 };
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index ef1ad69c26ed..5a60ab72ecb6 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -159,7 +159,6 @@ static const struct ata_port_operations qs_ata_ops = {
         .eng_timeout            = qs_eng_timeout,
         .irq_clear              = qs_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = qs_scr_read,
         .scr_write              = qs_scr_write,
         .port_start             = qs_port_start,
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 802d679dc994..1930e7cf1438 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -207,7 +207,6 @@ static const struct ata_port_operations sil_ops = {
         .post_internal_cmd      = ata_bmdma_post_internal_cmd,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = sil_scr_read,
         .scr_write              = sil_scr_write,
         .port_start             = ata_port_start,
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index e2cccc7f4358..961b3f201a38 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -398,8 +398,6 @@ static const struct ata_port_operations sil24_ops = {
         .qc_issue               = sil24_qc_issue,
 
         .irq_clear              = sil24_irq_clear,
-        .irq_on                 = ata_dummy_irq_on,
-        .irq_ack                = ata_dummy_irq_ack,
 
         .scr_read               = sil24_scr_read,
         .scr_write              = sil24_scr_write,
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 41c1d6e8f1fe..691017eddbb1 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -123,7 +123,6 @@ static const struct ata_port_operations sis_ops = {
         .post_internal_cmd      = ata_bmdma_post_internal_cmd,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = sis_scr_read,
         .scr_write              = sis_scr_write,
         .port_start             = ata_port_start,
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index d9678e7bc3a9..006a720da406 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -349,7 +349,6 @@ static const struct ata_port_operations k2_sata_ops = {
         .post_internal_cmd      = ata_bmdma_post_internal_cmd,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = k2_sata_scr_read,
         .scr_write              = k2_sata_scr_write,
         .port_start             = ata_port_start,
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 12691f091933..d5cbd16629ad 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -267,7 +267,6 @@ static const struct ata_port_operations pdc_20621_ops = {
         .eng_timeout            = pdc_eng_timeout,
         .irq_clear              = pdc20621_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .port_start             = pdc_port_start,
 };
 
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index e6b8b45279af..d4514e2149bc 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -117,7 +117,6 @@ static const struct ata_port_operations uli_ops = {
 
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .scr_read               = uli_scr_read,
         .scr_write              = uli_scr_write,
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 690280660b81..4b25c3ef986f 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -146,7 +146,6 @@ static const struct ata_port_operations vt6420_sata_ops = {
 
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -180,7 +179,6 @@ static const struct ata_port_operations vt6421_pata_ops = {
 
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
 };
@@ -211,7 +209,6 @@ static const struct ata_port_operations vt6421_sata_ops = {
 
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .scr_read               = svia_scr_read,
         .scr_write              = svia_scr_write,
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 9586b8b51cea..55fb2e0b369a 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -336,7 +336,6 @@ static const struct ata_port_operations vsc_sata_ops = {
         .post_internal_cmd      = ata_bmdma_post_internal_cmd,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
         .scr_read               = vsc_sata_scr_read,
         .scr_write              = vsc_sata_scr_write,
         .port_start             = ata_port_start,