lkml.org 
[lkml]   [2009]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] rtc-ds1553: Drop IRQF_DISABLED
Date
IRQF_DISABLED should be be used with IRQF_SHARED.  Drop IRQF_DISABLED
and add spin_lock_irqsave/spin_unlock_irqrestore to the interrupt
handler.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
drivers/rtc/rtc-ds1553.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index 38d472b..395f01b 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -195,14 +195,19 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id)
struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
void __iomem *ioaddr = pdata->ioaddr;
unsigned long events = RTC_IRQF;
+ unsigned long flags;

+ spin_lock_irqsave(&pdata->rtc->irq_lock, flags);
/* read and clear interrupt */
- if (!(readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_AF))
+ if (!(readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_AF)) {
+ spin_unlock_irqrestore(&pdata->rtc->irq_lock, flags);
return IRQ_NONE;
+ }
if (readb(ioaddr + RTC_SECONDS_ALARM) & 0x80)
events |= RTC_UF;
else
events |= RTC_AF;
+ spin_unlock_irqrestore(&pdata->rtc->irq_lock, flags);
rtc_update_irq(pdata->rtc, 1, events);
return IRQ_HANDLED;
}
@@ -329,7 +334,7 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev)
if (pdata->irq > 0) {
writeb(0, ioaddr + RTC_INTERRUPTS);
if (request_irq(pdata->irq, ds1553_rtc_interrupt,
- IRQF_DISABLED | IRQF_SHARED,
+ IRQF_SHARED,
pdev->name, pdev) < 0) {
dev_warn(&pdev->dev, "interrupt not available.\n");
pdata->irq = 0;
--
1.5.6.3


\
 
 \ /
  Last update: 2009-04-06 18:53    [W:0.064 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site