diff options
author | Michael Opdenacker <michael@free-electrons.com> | 2014-03-04 16:04:50 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-03-12 06:32:38 -0400 |
commit | 78f6db99522bbdd2f2a90c963744bd51c8602990 (patch) | |
tree | 25ba7eb37ea119658fb436e50c889a09d485071d /arch/arm/mach-rpc | |
parent | a09df10585d3b3b7a2f640b11fabea262e751091 (diff) |
ARM: 8000/1: misc: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag
from miscellaneous code in mach-xxx and plat-xxx
This flag is a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-rpc')
-rw-r--r-- | arch/arm/mach-rpc/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/time.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c index 85883b2e0e49..6d3517dc4772 100644 --- a/arch/arm/mach-rpc/dma.c +++ b/arch/arm/mach-rpc/dma.c | |||
@@ -141,7 +141,7 @@ static int iomd_request_dma(unsigned int chan, dma_t *dma) | |||
141 | struct iomd_dma *idma = container_of(dma, struct iomd_dma, dma); | 141 | struct iomd_dma *idma = container_of(dma, struct iomd_dma, dma); |
142 | 142 | ||
143 | return request_irq(idma->irq, iomd_dma_handle, | 143 | return request_irq(idma->irq, iomd_dma_handle, |
144 | IRQF_DISABLED, idma->dma.device_id, idma); | 144 | 0, idma->dma.device_id, idma); |
145 | } | 145 | } |
146 | 146 | ||
147 | static void iomd_free_dma(unsigned int chan, dma_t *dma) | 147 | static void iomd_free_dma(unsigned int chan, dma_t *dma) |
diff --git a/arch/arm/mach-rpc/time.c b/arch/arm/mach-rpc/time.c index 9a6def14df01..9a5158861ca9 100644 --- a/arch/arm/mach-rpc/time.c +++ b/arch/arm/mach-rpc/time.c | |||
@@ -75,7 +75,6 @@ ioc_timer_interrupt(int irq, void *dev_id) | |||
75 | 75 | ||
76 | static struct irqaction ioc_timer_irq = { | 76 | static struct irqaction ioc_timer_irq = { |
77 | .name = "timer", | 77 | .name = "timer", |
78 | .flags = IRQF_DISABLED, | ||
79 | .handler = ioc_timer_interrupt | 78 | .handler = ioc_timer_interrupt |
80 | }; | 79 | }; |
81 | 80 | ||