diff mbox

rtc-ds1553: Drop IRQF_DISABLED

Message ID 1239036633-10032-2-git-send-email-anemo@mba.ocn.ne.jp
State Superseded, archived
Headers show

Commit Message

Atsushi Nemoto April 6, 2009, 4:50 p.m. UTC
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(-)

Comments

Peter Zijlstra April 6, 2009, 7:33 p.m. UTC | #1
On Tue, 2009-04-07 at 01:50 +0900, Atsushi Nemoto wrote:
> IRQF_DISABLED should be be used with IRQF_SHARED.  Drop IRQF_DISABLED
> and add spin_lock_irqsave/spin_unlock_irqrestore to the interrupt
> handler.

I think you should use IRQF_DISABLED if at all possible. Only broken
hardware has an excuse not to.

NAK

> 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;

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
-~----------~----~----~----~------~----~------~--~---
Atsushi Nemoto April 7, 2009, 12:49 p.m. UTC | #2
On Mon, 06 Apr 2009 21:33:42 +0200, Peter Zijlstra <peterz@infradead.org> wrote:
> > IRQF_DISABLED should be be used with IRQF_SHARED.  Drop IRQF_DISABLED
> > and add spin_lock_irqsave/spin_unlock_irqrestore to the interrupt
> > handler.
> 
> I think you should use IRQF_DISABLED if at all possible. Only broken
> hardware has an excuse not to.
> 
> NAK

OK, then I will drop IRQF_SHARED instead.  There is no in-tree user of
this driver and only out-of-tree user I know uses dedicated irq line
for this RTC.

---
Atsushi Nemoto

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
-~----------~----~----~----~------~----~------~--~---
diff mbox

Patch

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;