diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-11-22 09:38:03 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-12-07 17:03:45 -0500 |
commit | 8b5690f8847490c1e3ea47266819833a13621253 (patch) | |
tree | e8eefebed470e7b7c3046b4fdb44fbdb4a021bc9 /arch/mips/pci | |
parent | 43064c0c8ee2ada8edd421520c633584d648e100 (diff) |
MIPS: irq: Remove IRQF_DISABLED
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled and we even check
and yell when an interrupt handler returns with interrupts enabled (see
commit [b738a50a: genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
[ralf@linux-mips.org: Fixed up conflicts in
arch/mips/alchemy/common/dbdma.c, arch/mips/cavium-octeon/smp.c and
arch/mips/kernel/perf_event.c.]
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de
linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2835/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/ops-pmcmsp.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/ops-tx3927.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/pci-tx4927.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/pci-tx4938.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/pci-tx4939.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c index 8fbfbf2b931c..389bf669d56e 100644 --- a/arch/mips/pci/ops-pmcmsp.c +++ b/arch/mips/pci/ops-pmcmsp.c | |||
@@ -405,7 +405,7 @@ int msp_pcibios_config_access(unsigned char access_type, | |||
405 | if (pciirqflag == 0) { | 405 | if (pciirqflag == 0) { |
406 | ret = request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */ | 406 | ret = request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */ |
407 | bpci_interrupt, | 407 | bpci_interrupt, |
408 | IRQF_SHARED | IRQF_DISABLED, | 408 | IRQF_SHARED, |
409 | "PMC MSP PCI Host", | 409 | "PMC MSP PCI Host", |
410 | preg); | 410 | preg); |
411 | if (ret != 0) | 411 | if (ret != 0) |
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c index 6a3bdb5ffa80..02d64f77e967 100644 --- a/arch/mips/pci/ops-tx3927.c +++ b/arch/mips/pci/ops-tx3927.c | |||
@@ -225,7 +225,7 @@ void __init tx3927_setup_pcierr_irq(void) | |||
225 | { | 225 | { |
226 | if (request_irq(TXX9_IRQ_BASE + TX3927_IR_PCI, | 226 | if (request_irq(TXX9_IRQ_BASE + TX3927_IR_PCI, |
227 | tx3927_pcierr_interrupt, | 227 | tx3927_pcierr_interrupt, |
228 | IRQF_DISABLED, "PCI error", | 228 | 0, "PCI error", |
229 | (void *)TX3927_PCIC_REG)) | 229 | (void *)TX3927_PCIC_REG)) |
230 | printk(KERN_WARNING "Failed to request irq for PCIERR\n"); | 230 | printk(KERN_WARNING "Failed to request irq for PCIERR\n"); |
231 | } | 231 | } |
diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c index a5807406a7f1..a032ae0a533d 100644 --- a/arch/mips/pci/pci-tx4927.c +++ b/arch/mips/pci/pci-tx4927.c | |||
@@ -85,7 +85,7 @@ void __init tx4927_setup_pcierr_irq(void) | |||
85 | { | 85 | { |
86 | if (request_irq(TXX9_IRQ_BASE + TX4927_IR_PCIERR, | 86 | if (request_irq(TXX9_IRQ_BASE + TX4927_IR_PCIERR, |
87 | tx4927_pcierr_interrupt, | 87 | tx4927_pcierr_interrupt, |
88 | IRQF_DISABLED, "PCI error", | 88 | 0, "PCI error", |
89 | (void *)TX4927_PCIC_REG)) | 89 | (void *)TX4927_PCIC_REG)) |
90 | printk(KERN_WARNING "Failed to request irq for PCIERR\n"); | 90 | printk(KERN_WARNING "Failed to request irq for PCIERR\n"); |
91 | } | 91 | } |
diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c index 20e45f30b2ef..141bba562488 100644 --- a/arch/mips/pci/pci-tx4938.c +++ b/arch/mips/pci/pci-tx4938.c | |||
@@ -136,7 +136,7 @@ void __init tx4938_setup_pcierr_irq(void) | |||
136 | { | 136 | { |
137 | if (request_irq(TXX9_IRQ_BASE + TX4938_IR_PCIERR, | 137 | if (request_irq(TXX9_IRQ_BASE + TX4938_IR_PCIERR, |
138 | tx4927_pcierr_interrupt, | 138 | tx4927_pcierr_interrupt, |
139 | IRQF_DISABLED, "PCI error", | 139 | 0, "PCI error", |
140 | (void *)TX4927_PCIC_REG)) | 140 | (void *)TX4927_PCIC_REG)) |
141 | printk(KERN_WARNING "Failed to request irq for PCIERR\n"); | 141 | printk(KERN_WARNING "Failed to request irq for PCIERR\n"); |
142 | } | 142 | } |
diff --git a/arch/mips/pci/pci-tx4939.c b/arch/mips/pci/pci-tx4939.c index 9ef840693baf..c10fbf2a19dc 100644 --- a/arch/mips/pci/pci-tx4939.c +++ b/arch/mips/pci/pci-tx4939.c | |||
@@ -101,7 +101,7 @@ void __init tx4939_setup_pcierr_irq(void) | |||
101 | { | 101 | { |
102 | if (request_irq(TXX9_IRQ_BASE + TX4939_IR_PCIERR, | 102 | if (request_irq(TXX9_IRQ_BASE + TX4939_IR_PCIERR, |
103 | tx4927_pcierr_interrupt, | 103 | tx4927_pcierr_interrupt, |
104 | IRQF_DISABLED, "PCI error", | 104 | 0, "PCI error", |
105 | (void *)TX4939_PCIC_REG)) | 105 | (void *)TX4939_PCIC_REG)) |
106 | pr_warning("Failed to request irq for PCIERR\n"); | 106 | pr_warning("Failed to request irq for PCIERR\n"); |
107 | } | 107 | } |