[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>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index baf7d05621907755312e461f346614d4346c9d8e..c888c966a0200487cb196f9af424b80a7ef1e589 100644 (file)
--- 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 e390ad47c8ef9c7322cee77736d60e698ca4e42a..6ec1bbc4fcc492b2e0c35dc2bdee67ede5bb53e9 100644 (file)
--- 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 4b66b9e9638fe4e92fa9e0097993cfe0874ebad2..68bc0ae671c570ed3262669fce61e27d1cb5aeac 100644 (file)
--- 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 9f87f7ddd4853c8a992db5aea9a281e32ecf0757..4f8b8d210cf41be45de3b49654ea62b528632342 100644 (file)
--- 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 dd528dbd9ccfb4b26e0b400d13ad7c88089f74a1..ccef99a0337c0ea22e1c42df3a856c63902d2916 100644 (file)
--- 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 32a10c99c06f22f2623b284fa8a7f9d16b435685..9436c49639291d29b43e58c85286a18d5e33ca17 100644 (file)
--- 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 d0cebe16a8ee2baf9a3178f01fa5d67d4a96afc4..46f829c838b3b78901572f9a2ecae1ec996ad66d 100644 (file)
--- 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 361f2fca7e549e4137a969fa9244991ad35b4e51..8c864353596e4a49b531cfa2ccfda5d1d47665dc 100644 (file)
--- 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 656f4d0a5728254c5de964552ee5a365e5c86464..f2bfdeb44023f9460b520bee7aace58203ad8ff6 100644 (file)
--- 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 0feb5ae8c4867fe48be92e2f784ba80df19ff392..a292ed97246dcc10a61ddaafcc16bd7ed9125e46 100644 (file)
--- 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 922902a1b4aeb16f8b7a0fb9ba13202447eaf4dc..d308c4644647a73ff1452bea8ff1b072c3499e91 100644 (file)
--- 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 e2459088cdcd2015bb4810a8d80249d062b541d5..300dcff949e2f4fa4b03213fc414a72414d67d55 100644 (file)
--- 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 eaaea848b649bc2ee54a232bd33e4ca58b7953fc..2b770072f39217fa2a503360fc5df0ea8ee97217 100644 (file)
--- 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 360b6f32e17ec2ca06cf5b748c3c8c170d71fbe6..94b1a9caf3cb12db1516d0ecbfc05576d49005bc 100644 (file)
--- 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 6cbc8778bf4f2fd2766f1ae837d88216820afcfd..8c439a9bb5ddda474fef0ebac98d1609729e8b1f 100644 (file)
--- 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 9f6fae6e38bfe071420496f4c0afba2be399840a..4d646ffb257b6c0cccb636fa4ed5b3bfaa40c1da 100644 (file)
--- 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 6f7d34ad19ef34152e966434c577c1cb69c88a3e..508d1cab52d12d1a7258de6138e50c0314e5493a 100644 (file)
--- 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 1a4d0ad68d182c4eb9054874106dbabf444ead2a..896e6e31c67ff753fb9eed104725a286a8fc2fbe 100644 (file)
--- 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 739a89180eb9b87d7e66407a8b35afecac935aba..2b7f099ac7856328ddae7398bf412af2bcbd04af 100644 (file)
--- 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 be0f05efac6d1c93a87628b37d1a3d62afc9ad4e..a2f81f40d7ace2f47d8f77e63bb5b1f634f077b1 100644 (file)
--- 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 64a711776c453b51e4c5be2f01bddcfbfb1fe0f9..ffcccfc0b9d4f20cdd5cccd110c1cc715fc21f8d 100644 (file)
--- 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 9e553c54203a32e5f44dfeac976de05d3af6a581..b8d6d5c43537c02f0131e089af8a6cbd2307a6f5 100644 (file)
--- 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 1daf1e19bdfc52490c44f4b6078f24a598571952..8aae9d7171c144b3443ddd1ed876c924d09c6445 100644 (file)
--- 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 f32d9b7ab496e7806b511cf1d2ed72841488e150..0179b29c5156032fdf01997e44d24082df55656c 100644 (file)
--- 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 6bf1709508abb8a3395c4b971e439796f6458299..ce1f9b17ad328b8c95d6c27feba0eb686a300bd3 100644 (file)
--- 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 1619b86b74af5d78357ab7af0df9bb7b7bc648a0..26f84063859d1db57b6761612279d50bd848e780 100644 (file)
--- 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 cfb2bc86a1d1726906835acce5f643fa4c4df094..6529d34f0370064fedf63e6bad80920b38a31f6d 100644 (file)
--- 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 b4dd18f3fa5d63ef33a0b674ed77dfc02d9e5709..021d9d9218bdd0a1e0cd045ec1878a3e0526b33d 100644 (file)
--- 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 099f4cdc4cd9823919c19489504c242993a74d6f..6e3fac2fedc434d2f05f27ef007b47dcafb889e8 100644 (file)
--- 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 36c964b9e7dafc949dd0ea423ea7d840f354bb44..8a82fcd4fa314623903c4032b4e8c72013c80621 100644 (file)
--- 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 40eb574828bf759b1b8a103c8431305819197e2e..2d64c58482fa92bfe29f6f15ec99331d95203c03 100644 (file)
--- 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 65a217727718995c3f3760450ac5debffaa6febb..00a763c67f9960beec3e3606cf916ff7c86faed0 100644 (file)
--- 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 5b2c86fe9fc2ef3cd415ac01dfad252007864290..851dae960018cae9bc44b1c88b437f751f1cd214 100644 (file)
--- 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 5770c7755a62cccb42db4e23cac8fe5ee131021e..0ab300cda9b79c03ce30f56235e556572cf6c5cb 100644 (file)
--- 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 09ef725afd90b71b2a31de7fb12a2d481d7f5a88..51c49283fb3987384cfa5cee2cf4395703be757a 100644 (file)
--- 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 9bfe12ac851ae0c1986253f66defb0f66ed05a91..f2167729c3df02e37c45563659b1e76db0808023 100644 (file)
--- 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 db069d7515bc7ca8be5520b5fb8c9f3e5c1416cd..7c6df320c833bd2fc95360d7ea5ba58b667eabf6 100644 (file)
--- 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 92447bed5e7716f615b423672bf0e52e524ce1f9..b03b338724576863e7253ae591bccb3f57784995 100644 (file)
--- 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 9dc628931e99cda7fb23d98c05e4da14c7eeeaf4..a616616706da7e9b8d73f71549d04a10699ec5ac 100644 (file)
--- 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 ec2206e820ac877eff5e44a2b89bd8c75cb140f7..ade5a442166341cdfb8b8a517bd6fc4393e42b78 100644 (file)
--- 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 7d1aabed422db6bd11c45c6f951171bed7a2c564..66b9a341931bd49469b4951c99c3c0f5fa38c03e 100644 (file)
--- 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 de3698cf3b8c3bd7f14c3c4204069aa867011999..98784647c7e88ad50de4bd3b655a8fcb9a3049a0 100644 (file)
--- 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 5edf67b1f3bf593f4ffc5e04c9eb46cfe83aac08..61edff4a5c6ebc1c8f1f0fc8fd2c2efe9936bff5 100644 (file)
--- 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 63fe99a10cd1cde36b25b94278e2d2d7890f725f..95f04b81352f9afb056206f7c982cf9c0d9d0847 100644 (file)
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -838,38 +838,6 @@ static u8 scc_irq_on (struct ata_port *ap)
        return tmp;
 }
 
-/**
- *     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 0faf99c8f13e4c8f85885c4d4c8d7941e4c6e6ce..c87cd67f41528aa8965a7b423408cc5806575ebf 100644 (file)
--- 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 45515a22d856ebac01e51d870071c4e19560237f..c5abf6616543d4c5fa13cd034f2efb0d2ed23279 100644 (file)
--- 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 b72227676f004fc1c691b32d78543a714ad83471..72850667d3714e30f5af13423675af05b1b32b9c 100644 (file)
--- 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 375c3705dc43002adb51c0ba89cc405c03bc1404..1c50c191e4bc3f18b4862c7c088a672166faca55 100644 (file)
--- 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 bc4b6f6be96362821f6b39d82bbd04290bccf87f..2a55eed45ad817edb9eb3b26b9748276d92910b9 100644 (file)
--- 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 b612808a319e2cc7da01bedb6d5b202ced8699ef..4ddcae8b8c962bb53b6007181991814d3b967fdc 100644 (file)
--- 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 c37570330073f09a82d82bf6ac733f05200067f9..c1647da5554361711e004a5aeb666cd34a1d22e2 100644 (file)
--- 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 304c19b9b0f2fec1a1e6de1934ac7cc6a11daded..7dd7361289c42d7b694328a6ad47201ddc26ba06 100644 (file)
--- 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 95caba0f910e94a6b6695a4805ad542aca1ea745..d6a3e286c79da5c2261c1d05b35bf1673bd936f1 100644 (file)
--- 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 56784ce10544b4e4a2a29f368a1c89fb3790cd1b..393fc655f8c1aa3b553cf6a1be17306749ca5327 100644 (file)
--- 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 884d9f05e6c6438a1d55317a81d2ce8a62002413..88ecca6343eaac2eb5ea1f8ff2f484d16297f0bb 100644 (file)
--- 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 c7238ce835413f181228ef11e97124e6b85f6228..37d737b442b564e32fe1e14779eb592e75ea446c 100644 (file)
--- 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 ef1ad69c26ed76f0ddbf514a64046e530a923549..5a60ab72ecb65ce9523f64e8aafc5481a0c34de2 100644 (file)
--- 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 802d679dc994654512f058f0b025586ad150bc58..1930e7cf143836e457bbd3bbcd1091c6c1ffe928 100644 (file)
--- 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 e2cccc7f4358488af43ebbc60e2496ae7ff2e291..961b3f201a3866f3bc445e504604f0c5f622372f 100644 (file)
--- 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 41c1d6e8f1feb037afc6a278dfd17652dc644380..691017eddbb1648f428f565a7a0d3092c9ed93d0 100644 (file)
--- 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 d9678e7bc3a9a3e36cfb71710d9c0e8db723a391..006a720da4069bc944d50d0c4deb71df0844b486 100644 (file)
--- 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 12691f091933c6523c742f0ff079f3663b9e5435..d5cbd16629ad2d117d675324fb991875586444fd 100644 (file)
--- 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 e6b8b45279afb8f670c74664239360c284fa2a66..d4514e2149bc0fb655ebba5144992fa68d64cf8e 100644 (file)
--- 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 690280660b815d610b8978b897a1f6e531c5e77b..4b25c3ef986fd553429e1d0d957f7497f71b0e75 100644 (file)
--- 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 9586b8b51cea71b320e55b6047220347b8a71d1c..55fb2e0b369a7893aedc9a768fe366207f00c672 100644 (file)
--- 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,

diff --git a/include/linux/libata.h b/include/linux/libata.h
index b89d191ceb2bb6a310c5904354dd5efc2df47842..9295cd541ffc90bbb664aa403f5159e4c10ff93f 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -644,7 +644,6 @@ struct ata_port_operations {
        irq_handler_t irq_handler;
        void (*irq_clear) (struct ata_port *);
        u8 (*irq_on) (struct ata_port *);
-       u8 (*irq_ack) (struct ata_port *ap, unsigned int chk_drq);
 
        int (*scr_read) (struct ata_port *ap, unsigned int sc_reg, u32 *val);
        int (*scr_write) (struct ata_port *ap, unsigned int sc_reg, u32 val);
@@ -852,9 +851,6 @@ extern int ata_scsi_change_queue_depth(struct scsi_device *sdev,
 extern struct ata_device *ata_dev_pair(struct ata_device *adev);
 extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);
 extern u8 ata_irq_on(struct ata_port *ap);
-extern u8 ata_dummy_irq_on(struct ata_port *ap);
-extern u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq);
-extern u8 ata_dummy_irq_ack(struct ata_port *ap, unsigned int chk_drq);
 
 extern int ata_cable_40wire(struct ata_port *ap);
 extern int ata_cable_80wire(struct ata_port *ap);