From patchwork Thu Feb 10 10:21:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 545951 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1AAM7AH005577 for ; Thu, 10 Feb 2011 10:22:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756097Ab1BJKVo (ORCPT ); Thu, 10 Feb 2011 05:21:44 -0500 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]:51464 "EHLO na3sys009aog103.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755992Ab1BJKVl (ORCPT ); Thu, 10 Feb 2011 05:21:41 -0500 Received: from source ([209.85.161.42]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKTVO8NPX34WE6rM+gOEEhmxwsd5JoZ403@postini.com; Thu, 10 Feb 2011 02:21:41 PST Received: by mail-fx0-f42.google.com with SMTP id 11so1735716fxm.15 for ; Thu, 10 Feb 2011 02:21:40 -0800 (PST) Received: by 10.223.96.67 with SMTP id g3mr14144385fan.19.1297333300715; Thu, 10 Feb 2011 02:21:40 -0800 (PST) Received: from localhost (cs181221087.pp.htv.fi [82.181.221.87]) by mx.google.com with ESMTPS id 5sm610710fak.47.2011.02.10.02.21.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 10 Feb 2011 02:21:39 -0800 (PST) From: Felipe Balbi To: Tony Lindgren Cc: Linux OMAP Mailing List , Felipe Balbi Subject: [PATCH 4/4] cbus: retu: rtc: grab IRQ via struct resource Date: Thu, 10 Feb 2011 12:21:21 +0200 Message-Id: <1297333281-29853-5-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.4.rc2 In-Reply-To: <1297333281-29853-1-git-send-email-balbi@ti.com> References: <1297333281-29853-1-git-send-email-balbi@ti.com> Organization: Texas Instruments\n Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 10 Feb 2011 10:22:07 +0000 (UTC) diff --git a/drivers/cbus/retu-rtc.c b/drivers/cbus/retu-rtc.c index a011ba7..5f52edf 100644 --- a/drivers/cbus/retu-rtc.c +++ b/drivers/cbus/retu-rtc.c @@ -52,6 +52,8 @@ struct retu_rtc { struct rtc_device *rtc; u16 alarm_expired; + int irq_rtcs; + int irq_rtca; }; static void retu_rtc_do_reset(struct retu_rtc *rtc) @@ -86,17 +88,24 @@ static irqreturn_t retu_rtc_interrupt(int irq, void *_rtc) static int retu_rtc_init_irq(struct retu_rtc *rtc) { + int irq; int ret; - ret = request_threaded_irq(CBUS_RETU_IRQ_BASE + RETU_INT_RTCS, NULL, retu_rtc_interrupt, + irq = platform_get_irq(to_platform_device(rtc->dev), 0); + rtc->irq_rtcs = irq; + + irq = platform_get_irq(to_platform_device(rtc->dev), 1); + rtc->irq_rtca = irq; + + ret = request_threaded_irq(rtc->irq_rtcs, NULL, retu_rtc_interrupt, 0, "RTCS", rtc); if (ret != 0) return ret; - ret = request_threaded_irq(CBUS_RETU_IRQ_BASE + RETU_INT_RTCA, NULL, retu_rtc_interrupt, + ret = request_threaded_irq(rtc->irq_rtca, NULL, retu_rtc_interrupt, 0, "RTCA", rtc); if (ret != 0) { - free_irq(CBUS_RETU_IRQ_BASE + RETU_INT_RTCS, rtc); + free_irq(rtc->irq_rtcs, rtc); return ret; } @@ -235,8 +244,8 @@ static int __init retu_rtc_probe(struct platform_device *pdev) return 0; err2: - free_irq(CBUS_RETU_IRQ_BASE + RETU_INT_RTCS, rtc); - free_irq(CBUS_RETU_IRQ_BASE + RETU_INT_RTCA, rtc); + free_irq(rtc->irq_rtcs, rtc); + free_irq(rtc->irq_rtca, rtc); err1: kfree(rtc); @@ -249,8 +258,8 @@ static int __devexit retu_rtc_remove(struct platform_device *pdev) { struct retu_rtc *rtc = platform_get_drvdata(pdev); - free_irq(CBUS_RETU_IRQ_BASE + RETU_INT_RTCS, rtc); - free_irq(CBUS_RETU_IRQ_BASE + RETU_INT_RTCA, rtc); + free_irq(rtc->irq_rtcs, rtc); + free_irq(rtc->irq_rtca, rtc); rtc_device_unregister(rtc->rtc); kfree(rtc);