From patchwork Wed Mar 10 18:26:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 47266 Return-Path: <3XuSXSwAACSYTVE-NKPWZIQQINGITQWRU.EQO@groups.bounces.google.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yx0-f147.google.com (mail-yx0-f147.google.com [209.85.210.147]) by ozlabs.org (Postfix) with ESMTP id 5DA52B7CF7 for ; Thu, 11 Mar 2010 05:26:41 +1100 (EST) Received: by yxe11 with SMTP id 11sf6130902yxe.1 for ; Wed, 10 Mar 2010 10:26:39 -0800 (PST) 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 :x-thread-url:x-message-url:sender:list-subscribe:list-unsubscribe :content-type; bh=E9OSyawd0vR9FvX8vtDYqb6JC/kSEX8euSSxW4zpEZU=; b=Ja1cm3d02vEn9BXhTA8tDfyUb3Ko1/rO8el0mcFbOZjtmlZdNivxzzowJ8u5L5gy5G MTI6RQjNHU/kTq5MeM49LjCTHCeI/v0m7rf25oHS82JYBSV66Su9B5nud/e0QFmek+Va YMO/JgAzVt82z0yOXDIpA++3EQBbCGyiJ1h+g= 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:x-thread-url:x-message-url:sender :list-subscribe:list-unsubscribe:content-type; b=0qmnjrnnK/bXWWPJaipS8ugZ5P3rgzodmSV0v+zB+s/+hUZIZbJu3G738YyIIv096N KT/wzPPy53XpfP+rXBizCxOEJnrduSjiagU20IxxLUm4WrE/FoXG7C/WAOrbFh9VaqNp 9yANER7vrn3+E2ZaJV675/GQ3a2rFLLHrrDgo= Received: by 10.91.113.9 with SMTP id q9mr219094agm.19.1268245598648; Wed, 10 Mar 2010 10:26:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.204.6.87 with SMTP id 23ls865529bky.0.p; Wed, 10 Mar 2010 10:26:36 -0800 (PST) Received: by 10.204.130.199 with SMTP id u7mr115898bks.35.1268245595603; Wed, 10 Mar 2010 10:26:35 -0800 (PST) Received: by 10.204.130.199 with SMTP id u7mr115897bks.35.1268245595570; Wed, 10 Mar 2010 10:26:35 -0800 (PST) Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com [80.75.67.52]) by gmr-mx.google.com with ESMTP id a10si4043278bkc.5.2010.03.10.10.26.29; Wed, 10 Mar 2010 10:26:30 -0800 (PST) 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 E0BAE11024D; Wed, 10 Mar 2010 18:26:26 +0000 (GMT) Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.71) (envelope-from ) id 1NpQby-0004xB-Du; Wed, 10 Mar 2010 18:26:26 +0000 From: Mark Brown To: Alessandro Zummo Cc: rtc-linux@googlegroups.com, Mark Brown Subject: [rtc-linux] rtc: Use genirq directly in rtc-wm831x Date: Wed, 10 Mar 2010 18:26:25 +0000 Message-Id: <1268245585-19014-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.0 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: X-Thread-Url: http://groups.google.com/group/rtc-linux/t/1b1a4fba1bee05c8 X-Message-Url: http://groups.google.com/group/rtc-linux/msg/42cd4adcfeaf9c73 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 000c7e4..3b0a9ec 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c @@ -448,17 +448,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); @@ -477,8 +477,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);