Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756029AbZDFQun (ORCPT ); Mon, 6 Apr 2009 12:50:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753805AbZDFQub (ORCPT ); Mon, 6 Apr 2009 12:50:31 -0400 Received: from mba.ocn.ne.jp ([122.1.235.107]:51814 "EHLO smtp.mba.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753141AbZDFQua (ORCPT ); Mon, 6 Apr 2009 12:50:30 -0400 From: Atsushi Nemoto To: Alessandro Zummo Cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org Subject: [PATCH] rtc-ds1553: Drop IRQF_DISABLED Date: Tue, 7 Apr 2009 01:50:32 +0900 Message-Id: <1239036633-10032-2-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1806 Lines: 51 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/