From patchwork Thu May 20 15:29:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 53089 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ww0-f56.google.com (mail-ww0-f56.google.com [74.125.82.56]) by ozlabs.org (Postfix) with ESMTP id 90262B7D1C for ; Fri, 21 May 2010 01:29:19 +1000 (EST) Received: by wwa36 with SMTP id 36sf1901553wwa.11 for ; Thu, 20 May 2010 08:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:mime-version:x-beenthere:received :received:received:received:received-spf:received:received:from:to :cc:subject:date:message-id:x-mailer :x-original-authentication-results:x-original-sender:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :sender:list-subscribe:list-unsubscribe:content-type; bh=uKMCUe2ViDZ+kVT81+ejbHZIKVtlHmzFibvgwVIRZFE=; b=Ck9IPLf9i+LiNkyiRXJwjZ0ARU3CCQEfC4UZdg0X6D9dqN6Z3mFnFQ+ARw/N5TZSt+ x7zMFxKPrguTmdv1oyYvVlIE3CTB+2ATX/LkUt9B5ABx+TweCc+rkwWQvBekHyVDatwn cqiBljhyGRKoulK+D8YsK/2j4KqQVxXpDDN8c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:x-original-authentication-results :x-original-sender:reply-to:precedence:mailing-list:list-id :list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; b=lKWLETXWLMmpF8KmDtnrnnyusTZGpTJu+crUBXFru3xKI5hVHiTK54lHT0rbPADXgY Rfi6fDLSZvh3ULsfjlsc0kYzHRY17RXJyrshBEEdOLEc568zqsipOZKwvK33Qy8CTlW5 2gFfju01aAG9ZY/z9JYX/+4fOuhq3RtmgtR+8= Received: by 10.223.62.145 with SMTP id x17mr57704fah.38.1274369356281; Thu, 20 May 2010 08:29:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.216.145.167 with SMTP id p39ls90064wej.0.p; Thu, 20 May 2010 08:29:15 -0700 (PDT) Received: by 10.216.186.85 with SMTP id v63mr893wem.14.1274369354890; Thu, 20 May 2010 08:29:14 -0700 (PDT) Received: by 10.216.186.85 with SMTP id v63mr892wem.14.1274369354828; Thu, 20 May 2010 08:29:14 -0700 (PDT) Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com [80.75.67.52]) by gmr-mx.google.com with ESMTP id v18si17807wbb.3.2010.05.20.08.29.14; Thu, 20 May 2010 08:29:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of broonie@opensource.wolfsonmicro.com designates 80.75.67.52 as permitted sender) client-ip=80.75.67.52; Received: from finisterre.wolfsonmicro.main (dsl081-056-243.sfo1.dsl.speakeasy.net [64.81.56.243]) by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 922611100CB; Thu, 20 May 2010 16:29:11 +0100 (BST) Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.71) (envelope-from ) id 1OF7gX-0002GU-Ed; Thu, 20 May 2010 08:29:21 -0700 From: Mark Brown To: Alessandro Zummo , akpm@linux-foundation.org Cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, Mark Brown Subject: [rtc-linux] [PATCH] rtc: Use genirq directly in rtc-wm831x Date: Thu, 20 May 2010 08:29:16 -0700 Message-Id: <1274369356-8680-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.1 X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of broonie@opensource.wolfsonmicro.com designates 80.75.67.52 as permitted sender) smtp.mail=broonie@opensource.wolfsonmicro.com X-Original-Sender: broonie@opensource.wolfsonmicro.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Now that the WM831x core uses genirq for the IRQ controller there is no need to use the WM831x-specific wrappers to request interrupts so convert to use genirq directly. Also use more meaningful strings to make /proc/interrupts more readily legible. Signed-off-by: Mark Brown --- drivers/rtc/rtc-wm831x.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index b16cfe5..82931dc 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c @@ -449,17 +449,17 @@ static int wm831x_rtc_probe(struct platform_device *pdev) goto err; } - ret = wm831x_request_irq(wm831x, per_irq, wm831x_per_irq, - IRQF_TRIGGER_RISING, "wm831x_rtc_per", - wm831x_rtc); + ret = request_threaded_irq(per_irq, NULL, wm831x_per_irq, + IRQF_TRIGGER_RISING, "RTC period", + wm831x_rtc); if (ret != 0) { dev_err(&pdev->dev, "Failed to request periodic IRQ %d: %d\n", per_irq, ret); } - ret = wm831x_request_irq(wm831x, alm_irq, wm831x_alm_irq, - IRQF_TRIGGER_RISING, "wm831x_rtc_alm", - wm831x_rtc); + ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq, + IRQF_TRIGGER_RISING, "RTC alarm", + wm831x_rtc); if (ret != 0) { dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n", alm_irq, ret); @@ -478,8 +478,8 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev) int per_irq = platform_get_irq_byname(pdev, "PER"); int alm_irq = platform_get_irq_byname(pdev, "ALM"); - wm831x_free_irq(wm831x_rtc->wm831x, alm_irq, wm831x_rtc); - wm831x_free_irq(wm831x_rtc->wm831x, per_irq, wm831x_rtc); + free_irq(alm_irq, wm831x_rtc); + free_irq(per_irq, wm831x_rtc); rtc_device_unregister(wm831x_rtc->rtc); kfree(wm831x_rtc);