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/alchemy | |
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/alchemy')
-rw-r--r-- | arch/mips/alchemy/common/dbdma.c | 3 | ||||
-rw-r--r-- | arch/mips/alchemy/common/time.c | 2 | ||||
-rw-r--r-- | arch/mips/alchemy/devboards/db1200/platform.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c index 0e63ee487d6d..9ba407b4fc97 100644 --- a/arch/mips/alchemy/common/dbdma.c +++ b/arch/mips/alchemy/common/dbdma.c | |||
@@ -1019,8 +1019,7 @@ static int __init dbdma_setup(unsigned int irq, dbdev_tab_t *idtable) | |||
1019 | dbdma_gptr->ddma_inten = 0xffff; | 1019 | dbdma_gptr->ddma_inten = 0xffff; |
1020 | au_sync(); | 1020 | au_sync(); |
1021 | 1021 | ||
1022 | ret = request_irq(irq, dbdma_interrupt, IRQF_DISABLED, "dbdma", | 1022 | ret = request_irq(irq, dbdma_interrupt, 0, "dbdma", (void *)dbdma_gptr); |
1023 | (void *)dbdma_gptr); | ||
1024 | if (ret) | 1023 | if (ret) |
1025 | printk(KERN_ERR "Cannot grab DBDMA interrupt!\n"); | 1024 | printk(KERN_ERR "Cannot grab DBDMA interrupt!\n"); |
1026 | else { | 1025 | else { |
diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c index d5da6adbf634..146a5fa80360 100644 --- a/arch/mips/alchemy/common/time.c +++ b/arch/mips/alchemy/common/time.c | |||
@@ -92,7 +92,7 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = { | |||
92 | 92 | ||
93 | static struct irqaction au1x_rtcmatch2_irqaction = { | 93 | static struct irqaction au1x_rtcmatch2_irqaction = { |
94 | .handler = au1x_rtcmatch2_irq, | 94 | .handler = au1x_rtcmatch2_irq, |
95 | .flags = IRQF_DISABLED | IRQF_TIMER, | 95 | .flags = IRQF_TIMER, |
96 | .name = "timer", | 96 | .name = "timer", |
97 | .dev_id = &au1x_rtcmatch2_clockdev, | 97 | .dev_id = &au1x_rtcmatch2_clockdev, |
98 | }; | 98 | }; |
diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c index c61867c93c4a..78459c17c628 100644 --- a/arch/mips/alchemy/devboards/db1200/platform.c +++ b/arch/mips/alchemy/devboards/db1200/platform.c | |||
@@ -276,12 +276,12 @@ static int db1200_mmc_cd_setup(void *mmc_host, int en) | |||
276 | 276 | ||
277 | if (en) { | 277 | if (en) { |
278 | ret = request_irq(DB1200_SD0_INSERT_INT, db1200_mmc_cd, | 278 | ret = request_irq(DB1200_SD0_INSERT_INT, db1200_mmc_cd, |
279 | IRQF_DISABLED, "sd_insert", mmc_host); | 279 | 0, "sd_insert", mmc_host); |
280 | if (ret) | 280 | if (ret) |
281 | goto out; | 281 | goto out; |
282 | 282 | ||
283 | ret = request_irq(DB1200_SD0_EJECT_INT, db1200_mmc_cd, | 283 | ret = request_irq(DB1200_SD0_EJECT_INT, db1200_mmc_cd, |
284 | IRQF_DISABLED, "sd_eject", mmc_host); | 284 | 0, "sd_eject", mmc_host); |
285 | if (ret) { | 285 | if (ret) { |
286 | free_irq(DB1200_SD0_INSERT_INT, mmc_host); | 286 | free_irq(DB1200_SD0_INSERT_INT, mmc_host); |
287 | goto out; | 287 | goto out; |