aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2011-07-26 17:44:28 -0700
committerTodd Poynor <toddpoynor@google.com>2011-07-26 20:07:29 -0700
commit40e3f7c08e7edb38378f4a43f810574094406afe (patch)
tree6dfe4d5fdc98c651f097d41ae111c167bdb7b3da /drivers/rtc
parent6ac2566c20407b9198b0fc0711337ff2b4b43fdf (diff)
downloadkernel_samsung_tuna-40e3f7c08e7edb38378f4a43f810574094406afe.zip
kernel_samsung_tuna-40e3f7c08e7edb38378f4a43f810574094406afe.tar.gz
kernel_samsung_tuna-40e3f7c08e7edb38378f4a43f810574094406afe.tar.bz2
rtc: twl: Use threaded IRQ, remove IRQ enable in interrupt handler
IRQs disabled on entry to twl_rtc_interrupt is not a consequence of LOCKDEP; both twl6030 and twl4030 explicitly disable IRQs before calling the module IRQ handlers. The ISR should not be enabling IRQs; use a threaded IRQ handler instead. Also fixes warnings: WARNING: at kernel/irq/handle.c:130 handle_irq_event_percpu+nnn irq nnn handler twl_rtc_interrupt+nnn enabled interrupts Change-Id: I5eea3f2545645eda2b9d0599e52fd23cb1416106 Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-twl.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index 886730e..3b5a95e 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -362,14 +362,6 @@ static irqreturn_t twl_rtc_interrupt(int irq, void *rtc)
int res;
u8 rd_reg;
-#ifdef CONFIG_LOCKDEP
- /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
- * we don't want and can't tolerate. Although it might be
- * friendlier not to borrow this thread context...
- */
- local_irq_enable();
-#endif
-
res = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
if (res)
goto out;
@@ -462,9 +454,9 @@ static int __devinit twl_rtc_probe(struct platform_device *pdev)
if (ret < 0)
goto out1;
- ret = request_irq(irq, twl_rtc_interrupt,
- IRQF_TRIGGER_RISING,
- dev_name(&rtc->dev), rtc);
+ ret = request_threaded_irq(irq, NULL, twl_rtc_interrupt,
+ IRQF_TRIGGER_RISING,
+ dev_name(&rtc->dev), rtc);
if (ret < 0) {
dev_err(&pdev->dev, "IRQ is not free.\n");
goto out1;