[PATCH] irq-flags: SH: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

父節點
5fb55ae955
當前提交
6d20819f80
@@ -56,7 +56,7 @@ static irqreturn_t g2_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static struct irqaction g2_dma_irq = {
|
||||
.name = "g2 DMA handler",
|
||||
.handler = g2_dma_interrupt,
|
||||
.flags = SA_INTERRUPT,
|
||||
.flags = IRQF_DISABLED,
|
||||
};
|
||||
|
||||
static int g2_enable_dma(struct dma_channel *chan)
|
||||
|
@@ -70,7 +70,7 @@ static int pvr2_xfer_dma(struct dma_channel *chan)
|
||||
static struct irqaction pvr2_dma_irq = {
|
||||
.name = "pvr2 DMA handler",
|
||||
.handler = pvr2_dma_interrupt,
|
||||
.flags = SA_INTERRUPT,
|
||||
.flags = IRQF_DISABLED,
|
||||
};
|
||||
|
||||
static struct dma_ops pvr2_dma_ops = {
|
||||
|
@@ -90,7 +90,7 @@ static int sh_dmac_request_dma(struct dma_channel *chan)
|
||||
chan->chan);
|
||||
|
||||
return request_irq(get_dmte_irq(chan->chan), dma_tei,
|
||||
SA_INTERRUPT, name, chan);
|
||||
IRQF_DISABLED, name, chan);
|
||||
}
|
||||
|
||||
static void sh_dmac_free_dma(struct dma_channel *chan)
|
||||
@@ -258,7 +258,7 @@ static int __init sh_dmac_init(void)
|
||||
|
||||
#ifdef CONFIG_CPU_SH4
|
||||
make_ipr_irq(DMAE_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
|
||||
i = request_irq(DMAE_IRQ, dma_err, SA_INTERRUPT, "DMAC Address Error", 0);
|
||||
i = request_irq(DMAE_IRQ, dma_err, IRQF_DISABLED, "DMAC Address Error", 0);
|
||||
if (i < 0)
|
||||
return i;
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user