From patchwork Mon May 3 13:29:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 51498 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wy0-f184.google.com (mail-wy0-f184.google.com [74.125.82.184]) by ozlabs.org (Postfix) with ESMTP id C9DF6B7D65 for ; Mon, 3 May 2010 23:29:47 +1000 (EST) Received: by wyi11 with SMTP id 11sf1174052wyi.11 for ; Mon, 03 May 2010 06:29:45 -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=FvQ8FdXVG9tCrto7NZgjCytBMRKeRJ3+DwpvLdLNAic=; b=s+XDoJkeyJAnsPBEbmmHAjeodjhikEuQbY0lQDloPrTYl4mAr5gFTEIViNkgOgPYa+ hX+1rwvU5pjVBziWzXW4FkYxWwwc8ygMXpZF99u57YuURTN2z4a2NDGVMQH6Hy9+eJZU Y2UvoD1OwyIn1lVCYqsL1xPHW9gFtvkrj5nuw= 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=5XoQTP//Cr4/AN3kFZ9xN1OmZMjCvFZ/CIUXum3DUvviaz1vnJXSZmtjloCrTBdF0Y XA3ptLI/Ek1unq6jQnChzTppRnalU5ZGbK9RgQBNA+KtY7vYdlhQBvoL6EMS5z9OLnnD kTRTXVBld6GeNTdg6RqygQgh9AceNPOsEtH7Q= Received: by 10.223.64.212 with SMTP id f20mr3402137fai.43.1272893385585; Mon, 03 May 2010 06:29:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.216.198.222 with SMTP id v72ls25505803wen.3.p; Mon, 03 May 2010 06:29:44 -0700 (PDT) Received: by 10.216.170.133 with SMTP id p5mr337160wel.11.1272893384250; Mon, 03 May 2010 06:29:44 -0700 (PDT) Received: by 10.216.170.133 with SMTP id p5mr337159wel.11.1272893384211; Mon, 03 May 2010 06:29:44 -0700 (PDT) Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com [80.75.67.52]) by gmr-mx.google.com with ESMTP id g1si4918777wbg.2.2010.05.03.06.29.43; Mon, 03 May 2010 06:29:43 -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 rakim.wolfsonmicro.main (lumison.wolfsonmicro.com [87.246.78.27]) by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 584FC110103; Mon, 3 May 2010 14:29:43 +0100 (BST) Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.71) (envelope-from ) id 1O8viQ-0000lH-Du; Mon, 03 May 2010 14:29:42 +0100 From: Mark Brown To: Alessandro Zummo Cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, Mark Brown Subject: [rtc-linux] [PATCH] rtc: Use genirq directly in rtc-wm831x Date: Mon, 3 May 2010 14:29:41 +0100 Message-Id: <1272893381-2899-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.0.3 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);