ARM: 8004/1: [SCSI]: remove deprecated IRQF_DISABLED
authorMichael Opdenacker <michael@free-electrons.com>
Wed, 5 Mar 2014 05:23:13 +0000 (06:23 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 12 Mar 2014 10:32:47 +0000 (10:32 +0000)
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>
drivers/scsi/arm/acornscsi.c
drivers/scsi/arm/cumana_1.c
drivers/scsi/arm/cumana_2.c
drivers/scsi/arm/powertec.c

index 09ba186..059ff47 100644 (file)
@@ -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);
index b679778..f8e0609 100644 (file)
@@ -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",
index 58915f2..abc66f5 100644 (file)
@@ -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);
index abc9593..5e1b73e 100644 (file)
@@ -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);