24 files changed, 27 insertions, 31 deletions

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 1e9d6ad9302b..bcd223868227 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -584,7 +584,7 @@ static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,
         NCR5380_setup(instance);
 
         for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1)
-                if ((mask & possible) && (request_irq(i, &probe_intr, IRQF_DISABLED, "NCR-probe", NULL) == 0))
+                if ((mask & possible) && (request_irq(i, &probe_intr, 0, "NCR-probe", NULL) == 0))
                         trying_irqs |= mask;
 
         timeout = jiffies + (250 * HZ / 1000);
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index bb9917c57760..5c6a8703f535 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -647,7 +647,7 @@ int _aac_rx_init(struct aac_dev *dev)
         dev->sync_mode = 0;     /* sync. mode not supported */
         dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
         if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
-                        IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {
+                        IRQF_SHARED, "aacraid", dev) < 0) {
                 if (dev->msi)
                         pci_disable_msi(dev->pdev);
                 printk(KERN_ERR "%s%d: Interrupt unavailable.\n",
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 2244f315f33b..e66477c98240 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -387,8 +387,7 @@ int aac_sa_init(struct aac_dev *dev)
                 goto error_irq;
         dev->sync_mode = 0;     /* sync. mode not supported */
         if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
-                        IRQF_SHARED|IRQF_DISABLED,
-                        "aacraid", (void *)dev ) < 0) {
+                        IRQF_SHARED, "aacraid", (void *)dev) < 0) {
                 printk(KERN_WARNING "%s%d: Interrupt unavailable.\n",
                         name, instance);
                 goto error_iounmap;
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index 7e17107643d4..9c65aed26212 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -647,7 +647,7 @@ int aac_src_init(struct aac_dev *dev)
         dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
 
         if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
-                        IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {
+                        IRQF_SHARED, "aacraid", dev) < 0) {
 
                 if (dev->msi)
                         pci_disable_msi(dev->pdev);
@@ -804,7 +804,7 @@ int aac_srcv_init(struct aac_dev *dev)
                 goto error_iounmap;
         dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
         if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
-                IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {
+                IRQF_SHARED, "aacraid", dev) < 0) {
                 if (dev->msi)
                         pci_disable_msi(dev->pdev);
                 printk(KERN_ERR "%s%d: Interrupt unavailable.\n",
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 3f7b6fee0a74..e86eb6a921fc 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -857,7 +857,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)
         SETPORT(SIMODE0, 0);
         SETPORT(SIMODE1, 0);
 
-        if( request_irq(shpnt->irq, swintr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) {
+        if (request_irq(shpnt->irq, swintr, IRQF_SHARED, "aha152x", shpnt)) {
                 printk(KERN_ERR "aha152x%d: irq %d busy.\n", shpnt->host_no, shpnt->irq);
                 goto out_host_put;
         }
@@ -891,7 +891,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)
         SETPORT(SSTAT0, 0x7f);
         SETPORT(SSTAT1, 0xef);
 
-        if ( request_irq(shpnt->irq, intr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) {
+        if (request_irq(shpnt->irq, intr, IRQF_SHARED, "aha152x", shpnt)) {
                 printk(KERN_ERR "aha152x%d: failed to reassign irq %d.\n", shpnt->host_no, shpnt->irq);
                 goto out_host_put;
         }
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h b/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
index 9df9e2ce3538..8373447bd7d3 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
@@ -209,7 +209,6 @@ struct instruction {
 #define AIC_OP_JC16     0x9105
 #define AIC_OP_JNC16    0x9205
 #define AIC_OP_CALL16   0x9305
-#define AIC_OP_CALL16   0x9305
 
 /* Page extension is low three bits of second opcode byte. */
 #define AIC_OP_JMPF     0xA005
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index 09ba1869d366..059ff477a398 100644
--- 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 b679778376c5..f8e060900052 100644
--- 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 58915f29055b..abc66f5263ec 100644
--- 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 abc9593615e9..5e1b73e1b743 100644
--- 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);
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index d01f01604140..eb29fe7eaf49 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -277,7 +277,7 @@ found:
                 /* With interrupts enabled, it will sometimes hang when doing heavy
                  * reads. So better not enable them until I finger it out. */
                 if (instance->irq != SCSI_IRQ_NONE)
-                        if (request_irq(instance->irq, dtc_intr, IRQF_DISABLED,
+                        if (request_irq(instance->irq, dtc_intr, 0,
                                         "dtc", instance)) {
                                 printk(KERN_ERR "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
                                 instance->irq = SCSI_IRQ_NONE;
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 94de88955a99..ebf57364df91 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -1221,7 +1221,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
 
         /* Board detected, allocate its IRQ */
         if (request_irq(irq, do_interrupt_handler,
-                        IRQF_DISABLED | ((subversion == ESA) ? IRQF_SHARED : 0),
+                        (subversion == ESA) ? IRQF_SHARED : 0,
                         driver_name, (void *)&sha[j])) {
                 printk("%s: unable to allocate IRQ %u, detaching.\n", name,
                        irq);
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 1663173cdb91..8319d2b417b8 100644
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -687,7 +687,7 @@ static int register_pio_HBA(long base, struct get_conf *gc, struct pci_dev *pdev
                 return 0;
 
         if (!reg_IRQ[gc->IRQ]) {        /* Interrupt already registered ? */
-                if (!request_irq(gc->IRQ, do_eata_pio_int_handler, IRQF_DISABLED, "EATA-PIO", sh)) {
+                if (!request_irq(gc->IRQ, do_eata_pio_int_handler, 0, "EATA-PIO", sh)) {
                         reg_IRQ[gc->IRQ]++;
                         if (!gc->IRQ_TR)
                                 reg_IRQL[gc->IRQ] = 1;  /* IRQ is edge triggered */
@@ -921,7 +921,7 @@ static int eata_pio_detect(struct scsi_host_template *tpnt)
 
         for (i = 0; i < MAXIRQ; i++)
                 if (reg_IRQ[i])
-                        request_irq(i, do_eata_pio_int_handler, IRQF_DISABLED, "EATA-PIO", NULL);
+                        request_irq(i, do_eata_pio_int_handler, 0, "EATA-PIO", NULL);
 
         HBA_ptr = first_HBA;
 
diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c
index b9750e296d71..6776931e25d4 100644
--- a/drivers/scsi/esas2r/esas2r_init.c
+++ b/drivers/scsi/esas2r/esas2r_init.c
@@ -231,7 +231,7 @@ use_legacy_interrupts:
 
 static void esas2r_claim_interrupts(struct esas2r_adapter *a)
 {
-        unsigned long flags = IRQF_DISABLED;
+        unsigned long flags = 0;
 
         if (a->intr_mode == INTR_MODE_LEGACY)
                 flags |= IRQF_SHARED;
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 5cec6c60ca22..7176365e916b 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -461,7 +461,7 @@ int __init generic_NCR5380_detect(struct scsi_host_template * tpnt)
 
                 if (instance->irq != SCSI_IRQ_NONE)
                         if (request_irq(instance->irq, generic_NCR5380_intr,
-                                        IRQF_DISABLED, "NCR5380", instance)) {
+                                        0, "NCR5380", instance)) {
                                 printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
                                 instance->irq = SCSI_IRQ_NONE;
                         }
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index ce5ef0190bad..0f1ae13ce7c7 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -4711,7 +4711,7 @@ static int __init gdth_isa_probe_one(u32 isa_bios)
         printk("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n",
                 isa_bios, ha->irq, ha->drq);
 
-        error = request_irq(ha->irq, gdth_interrupt, IRQF_DISABLED, "gdth", ha);
+        error = request_irq(ha->irq, gdth_interrupt, 0, "gdth", ha);
         if (error) {
                 printk("GDT-ISA: Unable to allocate IRQ\n");
                 goto out_host_put;
@@ -4843,7 +4843,7 @@ static int __init gdth_eisa_probe_one(u16 eisa_slot)
         printk("Configuring GDT-EISA HA at Slot %d IRQ %u\n",
                 eisa_slot >> 12, ha->irq);
 
-        error = request_irq(ha->irq, gdth_interrupt, IRQF_DISABLED, "gdth", ha);
+        error = request_irq(ha->irq, gdth_interrupt, 0, "gdth", ha);
         if (error) {
                 printk("GDT-EISA: Unable to allocate IRQ\n");
                 goto out_host_put;
@@ -4979,7 +4979,7 @@ static int gdth_pci_probe_one(gdth_pci_str *pcistr, gdth_ha_str **ha_out)
                 ha->irq);
 
         error = request_irq(ha->irq, gdth_interrupt,
-                                IRQF_DISABLED|IRQF_SHARED, "gdth", ha);
+                                IRQF_SHARED, "gdth", ha);
         if (error) {
                 printk("GDT-PCI: Unable to allocate IRQ\n");
                 goto out_host_put;
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index bf9eca845166..56f8a861ed72 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -589,7 +589,7 @@ static int crq_queue_create(struct crq_queue *queue, struct srp_target *target)
         }
 
         err = request_irq(vport->dma_dev->irq, &ibmvstgt_interrupt,
-                          IRQF_DISABLED, "ibmvstgt", target);
+                          0, "ibmvstgt", target);
         if (err)
                 goto req_irq_failed;
 
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index bf028218ac36..b1c4d831137d 100644
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -2015,7 +2015,7 @@ static int __init in2000_detect(struct scsi_host_template * tpnt)
                 write1_io(0, IO_FIFO_READ);     /* start fifo out in read mode */
                 write1_io(0, IO_INTR_MASK);     /* allow all ints */
                 x = int_tab[(switches & (SW_INT0 | SW_INT1)) >> SW_INT_SHIFT];
-                if (request_irq(x, in2000_intr, IRQF_DISABLED, "in2000", instance)) {
+                if (request_irq(x, in2000_intr, 0, "in2000", instance)) {
                         printk("in2000_detect: Unable to allocate IRQ.\n");
                         detect_count--;
                         continue;
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 280d5af113d1..e5dae7b54d9a 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2931,7 +2931,7 @@ static int initio_probe_one(struct pci_dev *pdev,
         shost->base = host->addr;
         shost->sg_tablesize = TOTAL_SG_ENTRY;
 
-        error = request_irq(pdev->irq, i91u_intr, IRQF_DISABLED|IRQF_SHARED, "i91u", shost);
+        error = request_irq(pdev->irq, i91u_intr, IRQF_SHARED, "i91u", shost);
         if (error < 0) {
                 printk(KERN_WARNING "initio: Unable to request IRQ %d\n", pdev->irq);
                 goto out_free_scbs;
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 62f1a6031765..0d78a4d5576c 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -453,7 +453,7 @@ int __init pas16_detect(struct scsi_host_template * tpnt)
             instance->irq = NCR5380_probe_irq(instance, PAS16_IRQS);
 
         if (instance->irq != SCSI_IRQ_NONE) 
-            if (request_irq(instance->irq, pas16_intr, IRQF_DISABLED,
+            if (request_irq(instance->irq, pas16_intr, 0,
                             "pas16", instance)) {
                 printk("scsi%d : IRQ%d not free, interrupts disabled\n", 
                     instance->host_no, instance->irq);
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index cb89d15b3028..c4f31b21feb8 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -716,11 +716,9 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha)
         /* SPCv controllers supports 64 msi-x */
         if (pm8001_ha->chip_id == chip_8001) {
                 number_of_intr = 1;
-                flag |= IRQF_DISABLED;
         } else {
                 number_of_intr = PM8001_MAX_MSIX_VEC;
                 flag &= ~IRQF_SHARED;
-                flag |= IRQF_DISABLED;
         }
 
         max_entry = sizeof(pm8001_ha->msix_entries) /
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index f1e4b4148c75..a4abce9d526e 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -259,7 +259,7 @@ found:
             instance->irq = NCR5380_probe_irq(instance, T128_IRQS);
 
         if (instance->irq != SCSI_IRQ_NONE) 
-            if (request_irq(instance->irq, t128_intr, IRQF_DISABLED, "t128",
+            if (request_irq(instance->irq, t128_intr, 0, "t128",
                             instance)) {
                 printk("scsi%d : IRQ%d not free, interrupts disabled\n", 
                     instance->host_no, instance->irq);
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index 9c216e563568..5a03bb3bcfef 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -873,7 +873,7 @@ static int port_detect \
 
    /* Board detected, allocate its IRQ */
    if (request_irq(irq, do_interrupt_handler,
-             IRQF_DISABLED | ((subversion == ESA) ? IRQF_SHARED : 0),
+             (subversion == ESA) ? IRQF_SHARED : 0,
              driver_name, (void *) &sha[j])) {
       printk("%s: unable to allocate IRQ %u, detaching.\n", name, irq);
       goto freelock;
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index f9a6e4b0affe..32674236fec7 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -1252,7 +1252,7 @@ static int wd7000_init(Adapter * host)
                 return 0;
 
 
-        if (request_irq(host->irq, wd7000_intr, IRQF_DISABLED, "wd7000", host)) {
+        if (request_irq(host->irq, wd7000_intr, 0, "wd7000", host)) {
                 printk("wd7000_init: can't get IRQ %d.\n", host->irq);
                 return (0);
         }