aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/drivers/dma/dma-sh.c
diff options
context:
space:
mode:
authorYong Zhang <yong.zhang0@gmail.com>2011-10-22 17:56:28 +0800
committerPaul Mundt <lethal@linux-sh.org>2011-10-28 14:39:28 +0900
commitd11584a0449f881181dc94dd697d3f3896c15c73 (patch)
tree0ca8ec496e6ba3a5ae687b8ba4cea5f55cc5bec2 /arch/sh/drivers/dma/dma-sh.c
parentc63bcc6ff135397b38cdb510c173e4a6629cede5 (diff)
SH: 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. Signed-off-by: Yong Zhang <yong.zhang0@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers/dma/dma-sh.c')
-rw-r--r--arch/sh/drivers/dma/dma-sh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 827208781ed..a60da6dd4d1 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -95,7 +95,7 @@ static int sh_dmac_request_dma(struct dma_channel *chan)
#if defined(CONFIG_SH_DMA_IRQ_MULTI)
IRQF_SHARED,
#else
- IRQF_DISABLED,
+ 0,
#endif
chan->dev_id, chan);
}
@@ -305,7 +305,7 @@ static int __init sh_dmac_init(void)
#if defined(CONFIG_SH_DMA_IRQ_MULTI)
IRQF_SHARED,
#else
- IRQF_DISABLED,
+ 0,
#endif
dmae_name[n], (void *)dmae_name[n]);
if (unlikely(i < 0)) {