diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-07 04:10:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-16 14:09:38 -0400 |
commit | 18e9351e453fbcf445cb8ffdd2e106e0212166da (patch) | |
tree | cab49bc86b7089c83b017ffb2328efd8849c884d /drivers/staging | |
parent | 6f27457b50c0439388e34d528f0fc200ddedb9a4 (diff) |
staging: irq: Remove IRQF_DISABLED
This flag is a NOOP and can be removed now.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/cx25821/cx25821-alsa.c | 2 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-audio-upstream.c | 2 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-core.c | 2 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video-upstream-ch2.c | 2 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video-upstream.c | 2 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/linux.c | 6 | ||||
-rw-r--r-- | drivers/staging/lirc/lirc_serial.c | 2 | ||||
-rw-r--r-- | drivers/staging/lirc/lirc_sir.c | 2 |
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) | |||
708 | chip->irq = dev->pci->irq; | 708 | chip->irq = dev->pci->irq; |
709 | 709 | ||
710 | err = request_irq(dev->pci->irq, cx25821_irq, | 710 | err = request_irq(dev->pci->irq, cx25821_irq, |
711 | IRQF_SHARED | IRQF_DISABLED, chip->dev->name, chip); | 711 | IRQF_SHARED, chip->dev->name, chip); |
712 | 712 | ||
713 | if (err < 0) { | 713 | if (err < 0) { |
714 | pr_err("ERROR %s: can't get IRQ %d for ALSA\n", | 714 | 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, | |||
680 | 680 | ||
681 | err = | 681 | err = |
682 | request_irq(dev->pci->irq, cx25821_upstream_irq_audio, | 682 | request_irq(dev->pci->irq, cx25821_upstream_irq_audio, |
683 | IRQF_SHARED | IRQF_DISABLED, dev->name, dev); | 683 | IRQF_SHARED, dev->name, dev); |
684 | if (err < 0) { | 684 | if (err < 0) { |
685 | pr_err("%s: can't get upstream IRQ %d\n", | 685 | pr_err("%s: can't get upstream IRQ %d\n", |
686 | dev->name, dev->pci->irq); | 686 | 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, | |||
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | err = | 1430 | err = |
1431 | request_irq(pci_dev->irq, cx25821_irq, IRQF_SHARED | IRQF_DISABLED, | 1431 | request_irq(pci_dev->irq, cx25821_irq, IRQF_SHARED, |
1432 | dev->name, dev); | 1432 | dev->name, dev); |
1433 | 1433 | ||
1434 | if (err < 0) { | 1434 | 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, | |||
693 | 693 | ||
694 | err = | 694 | err = |
695 | request_irq(dev->pci->irq, cx25821_upstream_irq_ch2, | 695 | request_irq(dev->pci->irq, cx25821_upstream_irq_ch2, |
696 | IRQF_SHARED | IRQF_DISABLED, dev->name, dev); | 696 | IRQF_SHARED, dev->name, dev); |
697 | if (err < 0) { | 697 | if (err < 0) { |
698 | pr_err("%s: can't get upstream IRQ %d\n", | 698 | pr_err("%s: can't get upstream IRQ %d\n", |
699 | dev->name, dev->pci->irq); | 699 | 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, | |||
749 | 749 | ||
750 | err = | 750 | err = |
751 | request_irq(dev->pci->irq, cx25821_upstream_irq, | 751 | request_irq(dev->pci->irq, cx25821_upstream_irq, |
752 | IRQF_SHARED | IRQF_DISABLED, dev->name, dev); | 752 | IRQF_SHARED, dev->name, dev); |
753 | if (err < 0) { | 753 | if (err < 0) { |
754 | pr_err("%s: can't get upstream IRQ %d\n", | 754 | pr_err("%s: can't get upstream IRQ %d\n", |
755 | dev->name, dev->pci->irq); | 755 | 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, | |||
1017 | **************************************************************/ | 1017 | **************************************************************/ |
1018 | 1018 | ||
1019 | if (request_irq (irq0, &c4_linux_interrupt, | 1019 | if (request_irq (irq0, &c4_linux_interrupt, |
1020 | #if defined(SBE_ISR_TASKLET) | ||
1021 | IRQF_DISABLED | IRQF_SHARED, | ||
1022 | #elif defined(SBE_ISR_IMMEDIATE) | ||
1023 | IRQF_DISABLED | IRQF_SHARED, | ||
1024 | #elif defined(SBE_ISR_INLINE) | ||
1025 | IRQF_SHARED, | 1020 | IRQF_SHARED, |
1026 | #endif | ||
1027 | ndev->name, ndev)) | 1021 | ndev->name, ndev)) |
1028 | { | 1022 | { |
1029 | pr_warning("%s: MUSYCC could not get irq: %d\n", ndev->name, irq0); | 1023 | 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) | |||
841 | int i, nlow, nhigh, result; | 841 | int i, nlow, nhigh, result; |
842 | 842 | ||
843 | result = request_irq(irq, irq_handler, | 843 | result = request_irq(irq, irq_handler, |
844 | IRQF_DISABLED | (share_irq ? IRQF_SHARED : 0), | 844 | (share_irq ? IRQF_SHARED : 0), |
845 | LIRC_DRIVER_NAME, (void *)&hardware); | 845 | LIRC_DRIVER_NAME, (void *)&hardware); |
846 | 846 | ||
847 | switch (result) { | 847 | 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) | |||
967 | return -EBUSY; | 967 | return -EBUSY; |
968 | } | 968 | } |
969 | #endif | 969 | #endif |
970 | retval = request_irq(irq, sir_interrupt, IRQF_DISABLED, | 970 | retval = request_irq(irq, sir_interrupt, 0, |
971 | LIRC_DRIVER_NAME, NULL); | 971 | LIRC_DRIVER_NAME, NULL); |
972 | if (retval < 0) { | 972 | if (retval < 0) { |
973 | # ifndef LIRC_ON_SA1100 | 973 | # ifndef LIRC_ON_SA1100 |