ARM: 8004/1: [SCSI]: remove deprecated IRQF_DISABLED

This patch removes the use of the IRQF_DISABLED flag
from drivers/scsi/arm

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index 09ba1869d366d1ba8881087d4e3c8f88d2e91f5b..059ff477a398290091ef35c8215a806799169e67 100644 (file)
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -2971,7 +2971,7 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
        ec->irqaddr     = ashost->fast + INT_REG;
        ec->irqmask     = 0x0a;
 
-       ret = request_irq(host->irq, acornscsi_intr, IRQF_DISABLED, "acornscsi", ashost);
+       ret = request_irq(host->irq, acornscsi_intr, 0, "acornscsi", ashost);
        if (ret) {
                printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n",
                        host->host_no, ashost->scsi.irq, ret);

diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index b679778376c5f62c6d3a2a83c01beb468fa1a849..f8e0609000521fd734958538369bce29a7c1f913 100644 (file)
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -262,7 +262,7 @@ static int cumanascsi1_probe(struct expansion_card *ec,
                goto out_unmap;
        }
 
-       ret = request_irq(host->irq, cumanascsi_intr, IRQF_DISABLED,
+       ret = request_irq(host->irq, cumanascsi_intr, 0,
                          "CumanaSCSI-1", host);
        if (ret) {
                printk("scsi%d: IRQ%d not free: %d\n",

diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 58915f29055b8050774ce2610f987092ad8d60a1..abc66f5263ec08988338f23b22d0e432529dd57e 100644 (file)
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -431,7 +431,7 @@ static int cumanascsi2_probe(struct expansion_card *ec,
                goto out_free;
 
        ret = request_irq(ec->irq, cumanascsi_2_intr,
-                         IRQF_DISABLED, "cumanascsi2", info);
+                         0, "cumanascsi2", info);
        if (ret) {
                printk("scsi%d: IRQ%d not free: %d\n",
                       host->host_no, ec->irq, ret);

diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index abc9593615e9a56df352b658aa1a9e0febf46d1f..5e1b73e1b743e3b175252e148d55f37375e5b444 100644 (file)
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -358,7 +358,7 @@ static int powertecscsi_probe(struct expansion_card *ec,
                goto out_free;
 
        ret = request_irq(ec->irq, powertecscsi_intr,
-                         IRQF_DISABLED, "powertec", info);
+                         0, "powertec", info);
        if (ret) {
                printk("scsi%d: IRQ%d not free: %d\n",
                       host->host_no, ec->irq, ret);