libata: add another IRQ calls (libata drivers)

This patch is against each libata driver.

Two IRQ calls are added in ata_port_operations.
- irq_on() is used to enable interrupts.
- irq_ack() is used to acknowledge a device interrupt.

In most drivers, ata_irq_on() and ata_irq_ack() are used for
irq_on and irq_ack respectively.

In some drivers (ex: ahci, sata_sil24) which cannot use them
as is, ata_dummy_irq_on() and ata_dummy_irq_ack() are used.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 6d664849cc095a2a8a382285baf9cf91ec9c2fda..92cdb0c5171f3a35fe347e02bf36bc60c12e2135 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -260,6 +260,8 @@ static const struct ata_port_operations ahci_ops = {
 
        .irq_handler            = ahci_interrupt,
        .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,
@@ -291,6 +293,8 @@ static const struct ata_port_operations ahci_vt8251_ops = {
 
        .irq_handler            = ahci_interrupt,
        .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 c79887f318416d141816d81a99b134af435e1b83..be66ea08da551f16fa76459510e8cc75fa65f0f1 100644 (file)
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -150,6 +150,8 @@ 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 37fe6c2b8ca252439b1b5193979374a7babebdf6..c528d42ee106b84c9a3573435ff607dd95dcc573 100644 (file)
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -308,6 +308,8 @@ 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,
 };
@@ -339,6 +341,8 @@ 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,
 };
@@ -367,6 +371,8 @@ 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/pata_ali.c b/drivers/ata/pata_ali.c
index dffa1f539fc9138e15bb7372661ea0324254a5c0..ab44d18850f6eed706b0576624c8d92359ef13e0 100644 (file)
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -374,6 +374,8 @@ 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,
 };
@@ -413,6 +415,8 @@ 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,
 };
@@ -449,6 +453,8 @@ 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,
 };
@@ -484,6 +490,8 @@ 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 ed0e4f6fc715150b7bd5172e81550df3426efa4f..619e44b04032ea0bada67d42ff73b81b81fb6893 100644 (file)
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -366,6 +366,8 @@ 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,
 };
@@ -398,6 +400,8 @@ 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,
 };
@@ -430,6 +434,8 @@ 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,
 };
@@ -462,6 +468,8 @@ 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,
 };
@@ -494,6 +502,8 @@ 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,
 };
@@ -526,6 +536,8 @@ 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 ace5a98dd59dea24aa48915b1ccf832c72dd7818..21c30282717ccafea9a541f9173552467bec932a 100644 (file)
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -345,6 +345,8 @@ 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,
 };
@@ -375,6 +377,8 @@ 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 f89ef7b15999b936e3f3ac26493267fb4accd8dd..c3eb40c91c80435c0fefda38c4159cd7eebec136 100644 (file)
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -256,6 +256,8 @@ 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_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 3a75978c1aee452b1521d5096f2f500ab5ee74f4..da098282b5f6ddab91d7bb358324a1613bf02bcd 100644 (file)
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -317,6 +317,8 @@ 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,
 };
@@ -349,6 +351,8 @@ 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,
 };
@@ -381,6 +385,8 @@ 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 801a00efa3ee01b9e3545c892649e9c4035d42a9..1ce8fcfd7826e08c32c90c130125c6013c7cb895 100644 (file)
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -197,6 +197,8 @@ static struct ata_port_operations cs5520_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_cs5530.c b/drivers/ata/pata_cs5530.c
index b9fd5388b476915df2a0cf1affead996ea5da856..3d7b7d87ec6f3a49647a0b5a6a9ab0ff4e4703bf 100644 (file)
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -221,6 +221,8 @@ 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 500f863cb9879a401f0810b507be260cc794ff03..17bc693cc5149b34e69e74879da4635d4aeb0046 100644 (file)
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -218,6 +218,8 @@ 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 4ca103d668ed3be93ebe6318ab2185ecaaffdd59..63f48f08763db323bc7e76984f5e1a6f6a62274c 100644 (file)
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -169,6 +169,8 @@ 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 a112dac98dd9ea8042bf52ff85b211f122cb3388..c19b6a8a7dc6c5afc6b433f6e2746cffb5edfa91 100644 (file)
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -265,6 +265,8 @@ 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 819d7a392781da6ad629688760ebd0f8883294b0..27d724b5eea2c138a54c5314290f3b031fdf4a9f 100644 (file)
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -365,6 +365,8 @@ 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 c6d8774df0deb060435cf8d8598aff7943e69d07..4ffc392052c02f1a2dfb4769d06cace005e84abd 100644 (file)
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -800,6 +800,8 @@ 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,
 };
@@ -837,6 +839,8 @@ 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,
 };
@@ -875,6 +879,8 @@ 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,
 };
@@ -913,6 +919,8 @@ 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 b56dc4a7185b59fa4f42569cbd82d70c0dba3ff4..65f2e180e7fa285644e9bf38522d39846da446b5 100644 (file)
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -377,6 +377,8 @@ 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 46fc417856cc9ce4f0c80c4ff8a9069583152b59..483ce7c12c9ac61da2e614e2f798ceb983abbaef 100644 (file)
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -152,6 +152,8 @@ 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_isapnp.c b/drivers/ata/pata_isapnp.c
index 4d9ab268cf281c4ad148b61396ee202e873a5d22..1bf5ec18b2e31490b350eb041773f04b265ad099 100644 (file)
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -57,6 +57,8 @@ static struct ata_port_operations isapnp_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_it8213.c b/drivers/ata/pata_it8213.c
index ec128316903d6168fab2d385cc70ef84ba5a47d0..7eac869dfcd3e984874b24773cde11852cd73d2a 100644 (file)
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -277,6 +277,8 @@ 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 e8a6e7d73b72b55f5de68f3f22ec87cc483b84d6..73394c75be4254fac5c0624c7b0ea23747279fdc 100644 (file)
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -678,6 +678,8 @@ 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,
 };
@@ -712,6 +714,8 @@ 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 d9ee1837b7ff79970d0434cf2af67d2180b523de..3222ac7b945d43637295ed8f9d349df8ce937367 100644 (file)
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -131,6 +131,8 @@ static struct ata_port_operations ixp4xx_port_ops = {
 
        .irq_handler    = ata_interrupt,
        .irq_clear      = ixp4xx_irq_clear,
+       .irq_on         = ata_irq_on,
+       .irq_ack        = ata_irq_ack,
 
        .port_start     = ata_port_start,
 

diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 26365c1078180ac38f402894dfb60956934c5c95..7a635dd326f85825d044a957d906a827497145c6 100644 (file)
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -166,6 +166,8 @@ static const struct ata_port_operations jmicron_ops = {
        /* IRQ-related hooks */
        .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 78b5f7136e1ebd72bd3933eb099b20698f4c52cb..4223e10de6a0aed4ecf8c4f3cba57e179901910a 100644 (file)
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -168,6 +168,8 @@ 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,
 };
@@ -191,6 +193,8 @@ 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,
 };
@@ -301,6 +305,8 @@ 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,
 };
@@ -351,6 +357,8 @@ 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,
 };
@@ -412,6 +420,8 @@ 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,
 };
@@ -528,6 +538,8 @@ 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,
 };
@@ -656,6 +668,8 @@ 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 586cbb750c99205b240c7483c6cbb951da10fa55..13a70ac6f1dc2f536b132229ac7706aa87e7d6e5 100644 (file)
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -134,6 +134,8 @@ static const struct ata_port_operations marvell_ops = {
        /* Timeout handling */
        .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 8a9d80c3628ec15abebe770b75d8e240d26212cd..d7378df44970bb1856aa52af9af4014e67efcce3 100644 (file)
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -298,6 +298,8 @@ static struct ata_port_operations mpc52xx_ata_port_ops = {
        .data_xfer              = ata_data_xfer,
        .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_mpiix.c b/drivers/ata/pata_mpiix.c
index 9837faf0f62060b7b73413081b263024295c2733..976663d1fb22b8dcb21191e21ed8fcd12e6e4b64 100644 (file)
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -192,6 +192,8 @@ static struct ata_port_operations mpiix_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_netcell.c b/drivers/ata/pata_netcell.c
index 23365a0ff9b0fc27acf6128268b55841b853caec..e8393e19be47d94b9c06b13e2a16ca157b9c9cce 100644 (file)
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -94,6 +94,8 @@ static const struct ata_port_operations netcell_ops = {
        /* IRQ-related hooks */
        .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 95c4e0b3f2d44b16630366e2e4d199c95d63c012..3d1fa487c48606aa0ac745f4b023ad8a818aff4c 100644 (file)
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -183,6 +183,8 @@ 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 95d570a30a2f5a298f310fb543626053205be505..b76d2b466614493ae02c79c3fa89e59c7d4d59ca 100644 (file)
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -263,6 +263,8 @@ 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 e763026315975bf839cea92d4442d168cb9eef65..da1aa148b37d9f69b5d91c88b57608f1e7d65461 100644 (file)
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -209,6 +209,8 @@ 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 067fca1fa8a17c8684928a12a8f91630814c64d8..d80b36e209cc52bc6de595d414caecb32163a975 100644 (file)
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -393,6 +393,8 @@ 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,
 };
@@ -426,6 +428,8 @@ 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 1830e9166943a898b771c92908623892ca3b3753..acfc09f9abd9cc8b56b2cf8d6adc73878dbd6d77 100644 (file)
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -92,6 +92,8 @@ static struct ata_port_operations pcmcia_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_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 2ff91bbbab063e9d0812fdc6195c4ffe9a4b791e..ffa7f47fbb2086357f7028edab9d43000b021add 100644 (file)
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -169,6 +169,8 @@ static struct ata_port_operations pdc2027x_pata100_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,
 };
@@ -201,6 +203,8 @@ static struct ata_port_operations pdc2027x_pata133_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_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index 7e194d81c1b643f94ac7f9eeee4c2cec5ba3f659..6dd63413a523475c82f45cd5c03746b9b13c01b2 100644 (file)
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -298,6 +298,8 @@ 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,
 };
@@ -330,6 +332,8 @@ 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 b35fc29f4db5abae526e4aef03f6a59a43dc4f33..479a326114e0ca4132740f2e619a793a9ef5046b 100644 (file)
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -87,6 +87,8 @@ static struct ata_port_operations pata_platform_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_qdi.c b/drivers/ata/pata_qdi.c
index 5b86effa0bbdf6d26653b3f2cf2ece95fb779bf9..1b3b4ed8eb194b22a606007561e7bc6e0a2fab69 100644 (file)
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -191,6 +191,8 @@ static struct ata_port_operations qdi6500_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,
 };
@@ -217,6 +219,8 @@ static struct ata_port_operations qdi6580_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_radisys.c b/drivers/ata/pata_radisys.c
index a391bd2fa8fe893d9b10d3a8e5a3d554bc36bd39..0d1e571ef6333572aa19df27b3588691c894cf7f 100644 (file)
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -259,6 +259,8 @@ 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 4a4d2e5be09bd25c39f1d7d4ac460e1da52c592a..71a2bac09e0d90ee7638d9ecc129d7ef1141b5d7 100644 (file)
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -124,6 +124,8 @@ 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 8d3e7c57b22cb94525934586e8257b4cd56cbf4d..58e42fbd14f939f9104758a044cda7b2f077ee72 100644 (file)
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -224,6 +224,8 @@ 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_serverworks.c b/drivers/ata/pata_serverworks.c
index c41a1d3b5b7d566188e51927fef657524842e1ad..ad5b43fef3d1a94914d090fc88476ed100a0e2a1 100644 (file)
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -352,6 +352,8 @@ 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,
 };
@@ -385,6 +387,8 @@ 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 992e22537023f4422680b6b54610128e8e6756f9..ed79fabe025c1e5beed1811da7a447d07205f873 100644 (file)
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -256,6 +256,8 @@ 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 c82d75b96f60428ff1af9b89dad0b9916def9b63..560103d55b2e9a09e784ea6882fc0d0fc5e7149a 100644 (file)
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -607,6 +607,8 @@ 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,
 };
@@ -638,6 +640,8 @@ 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,
 };
@@ -670,6 +674,8 @@ 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,
 };
@@ -701,6 +707,8 @@ 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,
 };
@@ -732,6 +740,8 @@ 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 c7770f8df8d3855dfc162481565a41883aa124b1..a4034567437842db8f3539a732e9a827ba233935 100644 (file)
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -266,6 +266,8 @@ 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 60f2eea3c838250e551f320051a0afdd5ff0452f..453ab90b721e5576057ef77ee8a64cce6b1b09cc 100644 (file)
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -225,6 +225,8 @@ 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 236276d6ef3bc1993fb9e14bb17f95e416a7d0f7..220fcd6c549296b82154b6f3d7b5a5da1953b337 100644 (file)
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -338,6 +338,8 @@ 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,
 };
@@ -371,6 +373,8 @@ 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 d24488bf564492d82429fae78a7fea4f73a2182f..0888b4f19f4c900467a158fa0d1bd6c03ad9210a 100644 (file)
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -160,6 +160,8 @@ static struct ata_port_operations winbond_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/pdc_adma.c b/drivers/ata/pdc_adma.c
index 71e17df83f48890c55ea9fb5e61dfd7f899d6cd3..b4ed8ce553e6845156cb0bb0b2fb542cb2b471e8 100644 (file)
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -175,6 +175,8 @@ static const struct ata_port_operations adma_ata_ops = {
        .data_xfer              = ata_data_xfer,
        .irq_handler            = adma_intr,
        .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 b2a6f77b38d697f880b0b0d504c4cf88f374ae14..170a10ad478ffa923d27c143d049099dff4ef361 100644 (file)
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -563,6 +563,8 @@ static struct ata_port_operations inic_port_ops = {
 
        .irq_handler            = inic_interrupt,
        .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 7c578c275db0f041beb714fb74ed1930083959fa..769eca52442c73706d1eda322f8859352d9df423 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -410,6 +410,8 @@ static const struct ata_port_operations mv5_ops = {
 
        .irq_handler            = mv_interrupt,
        .irq_clear              = mv_irq_clear,
+       .irq_on                 = ata_irq_on,
+       .irq_ack                = ata_irq_ack,
 
        .scr_read               = mv5_scr_read,
        .scr_write              = mv5_scr_write,
@@ -437,6 +439,8 @@ static const struct ata_port_operations mv6_ops = {
 
        .irq_handler            = mv_interrupt,
        .irq_clear              = mv_irq_clear,
+       .irq_on                 = ata_irq_on,
+       .irq_ack                = ata_irq_ack,
 
        .scr_read               = mv_scr_read,
        .scr_write              = mv_scr_write,
@@ -464,6 +468,8 @@ static const struct ata_port_operations mv_iie_ops = {
 
        .irq_handler            = mv_interrupt,
        .irq_clear              = mv_irq_clear,
+       .irq_on                 = ata_irq_on,
+       .irq_ack                = ata_irq_ack,
 
        .scr_read               = mv_scr_read,
        .scr_write              = mv_scr_write,

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index b9ef6f5f4024a90d1ec3d326da7b159dc6b03537..77e47b74ae96793e72cb1430560148b89b4545d3 100644 (file)
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -362,6 +362,8 @@ static const struct ata_port_operations nv_generic_ops = {
        .data_xfer              = ata_data_xfer,
        .irq_handler            = nv_generic_interrupt,
        .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,
@@ -387,6 +389,8 @@ static const struct ata_port_operations nv_nf2_ops = {
        .data_xfer              = ata_data_xfer,
        .irq_handler            = nv_nf2_interrupt,
        .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,
@@ -412,6 +416,8 @@ static const struct ata_port_operations nv_ck804_ops = {
        .data_xfer              = ata_data_xfer,
        .irq_handler            = nv_ck804_interrupt,
        .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,6 +445,8 @@ static const struct ata_port_operations nv_adma_ops = {
        .data_xfer              = ata_data_xfer,
        .irq_handler            = nv_adma_interrupt,
        .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 4fb47cad82293036b04374a86b9956373896ba4c..3be4cc338d7bd6b6265a3d9aad5d75caab68df2d 100644 (file)
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -172,6 +172,8 @@ static const struct ata_port_operations pdc_sata_ops = {
        .data_xfer              = ata_data_xfer,
        .irq_handler            = pdc_interrupt,
        .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,
@@ -197,6 +199,8 @@ static const struct ata_port_operations pdc_old_sata_ops = {
        .data_xfer              = ata_data_xfer,
        .irq_handler            = pdc_interrupt,
        .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,
@@ -220,6 +224,8 @@ static const struct ata_port_operations pdc_pata_ops = {
        .eng_timeout            = pdc_eng_timeout,
        .irq_handler            = pdc_interrupt,
        .irq_clear              = pdc_irq_clear,
+       .irq_on                 = ata_irq_on,
+       .irq_ack                = ata_irq_ack,
 
        .port_start             = pdc_port_start,
 };

diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index cd579b18027402298daf5a16ab04c6f6da1f6cdd..bfa35ede655178d5cabb13e3d07ea602a705321d 100644 (file)
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -161,6 +161,8 @@ static const struct ata_port_operations qs_ata_ops = {
        .eng_timeout            = qs_eng_timeout,
        .irq_handler            = qs_intr,
        .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 4a25093b2ddae875ecaa6fdeca15edc1f5cd5f2f..dca3d3749f0626cbc2d79798ecda01502b1452e3 100644 (file)
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -209,6 +209,8 @@ static const struct ata_port_operations sil_ops = {
        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
        .irq_handler            = sil_interrupt,
        .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 9dcf11e2c7b330ab86bcca045b1f2d9109c587da..e65e8d55da3e9b36dea407bc6993b724a8ebf1db 100644 (file)
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -400,6 +400,8 @@ static const struct ata_port_operations sil24_ops = {
 
        .irq_handler            = sil24_interrupt,
        .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 eee2097c10c02bc27033d5831cc72623be1bb8e9..49c9e2bd706f9ad1f9367f78d481c1fb8139f668 100644 (file)
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -124,6 +124,8 @@ static const struct ata_port_operations sis_ops = {
        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
        .irq_handler            = ata_interrupt,
        .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 5ce4f593687dcd666a2955d2f2bc2c12a35aeaf3..4e4289994204ea0409c982ae66cc15a9862051fd 100644 (file)
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -356,6 +356,8 @@ static const struct ata_port_operations k2_sata_ops = {
        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
        .irq_handler            = ata_interrupt,
        .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 f83038cf1b35169b42ce5ce49b2099145587e357..06e87a37738239d7b8b427673cf1ac005fa00f27 100644 (file)
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -207,6 +207,8 @@ static const struct ata_port_operations pdc_20621_ops = {
        .eng_timeout            = pdc_eng_timeout,
        .irq_handler            = pdc20621_interrupt,
        .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 77de7cbbe1ae455d9a6d3291c9b91c9bb3cb6d07..80131eec68f4cfe95aa028c2533b9cc883f92d87 100644 (file)
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -117,6 +117,8 @@ static const struct ata_port_operations uli_ops = {
 
        .irq_handler            = ata_interrupt,
        .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 6b558195a76faf2aeee42a5250232a8183b730ac..baca6d79bb0bc426eda80fe358555a35c246981e 100644 (file)
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -143,6 +143,8 @@ static const struct ata_port_operations vt6420_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,
 };
@@ -175,6 +177,8 @@ static const struct ata_port_operations vt6421_pata_ops = {
 
        .irq_handler            = ata_interrupt,
        .irq_clear              = ata_bmdma_irq_clear,
+       .irq_on                 = ata_irq_on,
+       .irq_ack                = ata_irq_ack,
 
        .port_start             = vt6421_port_start,
 };
@@ -204,6 +208,8 @@ static const struct ata_port_operations vt6421_sata_ops = {
 
        .irq_handler            = ata_interrupt,
        .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 7596e9ace50bd2dc098403df9455d0425e2401a7..3d9daf231115b46c1e7385d2c41ac1b00da31d4a 100644 (file)
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -310,6 +310,8 @@ static const struct ata_port_operations vsc_sata_ops = {
        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
        .irq_handler            = vsc_sata_interrupt,
        .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,