8 files changed, 7 insertions, 13 deletions

diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c
index ebdba7c65bc..09e99de5fd2 100644
--- a/drivers/staging/cx25821/cx25821-alsa.c
+++ b/drivers/staging/cx25821/cx25821-alsa.c
@@ -708,7 +708,7 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
         chip->irq = dev->pci->irq;
 
         err = request_irq(dev->pci->irq, cx25821_irq,
-                          IRQF_SHARED | IRQF_DISABLED, chip->dev->name, chip);
+                          IRQF_SHARED, chip->dev->name, chip);
 
         if (err < 0) {
                 pr_err("ERROR %s: can't get IRQ %d for ALSA\n",
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c
index 50e56a64112..c20d6dece15 100644
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/staging/cx25821/cx25821-audio-upstream.c
@@ -680,7 +680,7 @@ int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev,
 
         err =
             request_irq(dev->pci->irq, cx25821_upstream_irq_audio,
-                        IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                        IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 pr_err("%s: can't get upstream IRQ %d\n",
                        dev->name, dev->pci->irq);
diff --git a/drivers/staging/cx25821/cx25821-core.c b/drivers/staging/cx25821/cx25821-core.c
index 3ec58af0e26..a7fa38f9594 100644
--- a/drivers/staging/cx25821/cx25821-core.c
+++ b/drivers/staging/cx25821/cx25821-core.c
@@ -1428,7 +1428,7 @@ static int __devinit cx25821_initdev(struct pci_dev *pci_dev,
         }
 
         err =
-            request_irq(pci_dev->irq, cx25821_irq, IRQF_SHARED | IRQF_DISABLED,
+            request_irq(pci_dev->irq, cx25821_irq, IRQF_SHARED,
                         dev->name, dev);
 
         if (err < 0) {
diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
index 08ac7c1a7bb..2a724ddfa53 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
@@ -693,7 +693,7 @@ int cx25821_start_video_dma_upstream_ch2(struct cx25821_dev *dev,
 
         err =
             request_irq(dev->pci->irq, cx25821_upstream_irq_ch2,
-                        IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                        IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 pr_err("%s: can't get upstream IRQ %d\n",
                        dev->name, dev->pci->irq);
diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c
index 14a6a6c0340..c0b80068f46 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream.c
@@ -749,7 +749,7 @@ int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,
 
         err =
             request_irq(dev->pci->irq, cx25821_upstream_irq,
-                        IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                        IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 pr_err("%s: can't get upstream IRQ %d\n",
                        dev->name, dev->pci->irq);
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index 9ced08f253b..24e009c0149 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -1017,13 +1017,7 @@ c4_add_dev (hdw_info_t * hi, int brdno, unsigned long f0, unsigned long f1,
      **************************************************************/
 
     if (request_irq (irq0, &c4_linux_interrupt,
-#if defined(SBE_ISR_TASKLET)
-                     IRQF_DISABLED | IRQF_SHARED,
-#elif defined(SBE_ISR_IMMEDIATE)
-                     IRQF_DISABLED | IRQF_SHARED,
-#elif defined(SBE_ISR_INLINE)
                      IRQF_SHARED,
-#endif
                      ndev->name, ndev))
     {
         pr_warning("%s: MUSYCC could not get irq: %d\n", ndev->name, irq0);
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c
index 805df913bb6..8a060a8a722 100644
--- a/drivers/staging/lirc/lirc_serial.c
+++ b/drivers/staging/lirc/lirc_serial.c
@@ -841,7 +841,7 @@ static int init_port(void)
         int i, nlow, nhigh, result;
 
         result = request_irq(irq, irq_handler,
-                             IRQF_DISABLED | (share_irq ? IRQF_SHARED : 0),
+                             (share_irq ? IRQF_SHARED : 0),
                              LIRC_DRIVER_NAME, (void *)&hardware);
 
         switch (result) {
diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/lirc/lirc_sir.c
index 0d3864594b1..6903d3992ec 100644
--- a/drivers/staging/lirc/lirc_sir.c
+++ b/drivers/staging/lirc/lirc_sir.c
@@ -967,7 +967,7 @@ static int init_port(void)
                 return -EBUSY;
         }
 #endif
-        retval = request_irq(irq, sir_interrupt, IRQF_DISABLED,
+        retval = request_irq(irq, sir_interrupt, 0,
                              LIRC_DRIVER_NAME, NULL);
         if (retval < 0) {
 #               ifndef LIRC_ON_SA1100