aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-sa1100.c
diff options
context:
space:
mode:
authorYong Zhang <yong.zhang0@gmail.com>2012-03-23 18:02:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-23 19:58:39 -0400
commit2f6e5f9458646263d3d9ffadd5e11e3d8d15a7d0 (patch)
treed7c0e867b5de5a5b94c32c2c66a4e22e934918a7 /drivers/rtc/rtc-sa1100.c
parent2778ebcc09c002cccdbd6b5509b5cbf4161b486d (diff)
drivers/rtc: remove IRQF_DISABLED
Since commit e58aa3d2d0cc ("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 b738a50a2026 ("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> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Wan ZongShun <mcuos.com@gmail.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-sa1100.c')
-rw-r--r--drivers/rtc/rtc-sa1100.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index cb9a585312cc..fb758db9d0f4 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -160,14 +160,13 @@ static int sa1100_rtc_open(struct device *dev)
160 struct platform_device *plat_dev = to_platform_device(dev); 160 struct platform_device *plat_dev = to_platform_device(dev);
161 struct rtc_device *rtc = platform_get_drvdata(plat_dev); 161 struct rtc_device *rtc = platform_get_drvdata(plat_dev);
162 162
163 ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED, 163 ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev);
164 "rtc 1Hz", dev);
165 if (ret) { 164 if (ret) {
166 dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz); 165 dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
167 goto fail_ui; 166 goto fail_ui;
168 } 167 }
169 ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED, 168 ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
170 "rtc Alrm", dev); 169 "rtc Alrm", dev);
171 if (ret) { 170 if (ret) {
172 dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm); 171 dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
173 goto fail_ai; 172 goto fail_ai;