This flag is a NOOP and can be removed now.

Signed-off-by: Yong Zhang <[email protected]>
---
 drivers/staging/cx25821/cx25821-alsa.c             |    2 +-
 drivers/staging/cx25821/cx25821-audio-upstream.c   |    2 +-
 drivers/staging/cx25821/cx25821-core.c             |    2 +-
 .../staging/cx25821/cx25821-video-upstream-ch2.c   |    2 +-
 drivers/staging/cx25821/cx25821-video-upstream.c   |    2 +-
 drivers/staging/cxt1e1/linux.c                     |    6 ------
 drivers/staging/lirc/lirc_serial.c                 |    2 +-
 drivers/staging/lirc/lirc_sir.c                    |    2 +-
 drivers/staging/nvec/nvec.c                        |    2 +-
 9 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/cx25821/cx25821-alsa.c 
b/drivers/staging/cx25821/cx25821-alsa.c
index ebdba7c..09e99de 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 0f9ca77..4e2270d8 100644
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/staging/cx25821/cx25821-audio-upstream.c
@@ -690,7 +690,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 523ac5e..94329b7 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 655357d..d983f57 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
@@ -704,7 +704,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 eb0172b..6132632 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream.c
@@ -753,7 +753,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 9ced08f..24e009c 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 805df91..8a060a8 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 0d38645..6903d39 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
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 72258e8..6210c95 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -339,7 +339,7 @@ static int __devinit tegra_nvec_probe(struct 
platform_device *pdev)
 
        tegra_init_i2c_slave(pdata, i2c_regs, i2c_clk);
 
-       err = request_irq(nvec->irq, i2c_interrupt, IRQF_DISABLED, "nvec", 
nvec);
+       err = request_irq(nvec->irq, i2c_interrupt, 0, "nvec", nvec);
        if(err) {
                dev_err(nvec->dev, "couldn't request irq");
                goto failed;
-- 
1.7.4.1

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to