From patchwork Tue Aug 25 10:51:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 32034 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.217.182]) by bilbo.ozlabs.org (Postfix) with ESMTP id 464B3B70BA for ; Tue, 25 Aug 2009 20:51:15 +1000 (EST) Received: by gxk2 with SMTP id 2so8733448gxk.1 for ; Tue, 25 Aug 2009 03:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:received:x-sender:x-apparently-to :received:received:received:received-spf:received:received:from:to :cc:subject:date:message-id:x-mailer:reply-to:sender:precedence :x-google-loop:mailing-list:list-id:list-post:list-help :list-unsubscribe:x-beenthere-env:x-beenthere; bh=rRxw0RMDq6fa5TmZXvTUvzk39q+rrBVgUGZ9Y8zOYoo=; b=LVbxhlzp5zlcaaG82x1aYGjIw0B7wxXTlyibY+TygmSFb8jSdUa1lNpS7a43Pa6bn1 Tuzgeh/z6B2d9LtoSbtZiZExW+Wn/XFPRrsry83rJYxi7SaXj5WPFoPmHQE3WZpBiJGT XjD+qKN8axdJt5SlqrQWtNK5xwBAe1MqhgcLI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-sender:x-apparently-to:received-spf:authentication-results:from :to:cc:subject:date:message-id:x-mailer:reply-to:sender:precedence :x-google-loop:mailing-list:list-id:list-post:list-help :list-unsubscribe:x-beenthere-env:x-beenthere; b=jlvtzvnqXWbyNlGvFjxTaA4/Z9s4rW4ceJj0LodFBR64yrWN1gOKcHleTBsnpIqDIh uJm6BbRsO7ibexfohkRONFPR6NcpDqPZlm0tGUFiNHStaUQ3Lc22gf7mK1Lig1q/8xoM VsVvvpdkknFQr6vJ+uT21AlgRyW25rUwG8J3U= Received: by 10.100.51.14 with SMTP id y14mr2997726any.13.1251197472004; Tue, 25 Aug 2009 03:51:12 -0700 (PDT) Received: by 10.177.125.38 with SMTP id c38gr2774yqn.0; Tue, 25 Aug 2009 03:51:11 -0700 (PDT) X-Sender: broonie@opensource.wolfsonmicro.com X-Apparently-To: rtc-linux@googlegroups.com Received: by 10.210.12.13 with SMTP id 13mr661322ebl.3.1251197471294; Tue, 25 Aug 2009 03:51:11 -0700 (PDT) Received: by 10.210.12.13 with SMTP id 13mr661321ebl.3.1251197471271; Tue, 25 Aug 2009 03:51:11 -0700 (PDT) Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com [80.75.67.52]) by gmr-mx.google.com with ESMTP id 15si1638202ewy.4.2009.08.25.03.51.10; Tue, 25 Aug 2009 03:51:11 -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; 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 Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com [87.246.78.27]) by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 5851D1100D7; Tue, 25 Aug 2009 11:51:10 +0100 (BST) Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.69) (envelope-from ) id 1MftcL-0000qo-UL; Tue, 25 Aug 2009 11:51:09 +0100 From: Mark Brown To: Samuel Ortiz Cc: linux-kernel@vger.kernel.org, Alessandro Zummo , Mark Brown , rtc-linux@googlegroups.com Subject: [rtc-linux] [PATCH] RTC: Update for final round of review comments Date: Tue, 25 Aug 2009 11:51:08 +0100 Message-Id: <1251197468-3242-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.6.3.3 Reply-To: rtc-linux@googlegroups.com Sender: rtc-linux@googlegroups.com Precedence: bulk X-Google-Loop: groups Mailing-List: list rtc-linux@googlegroups.com; contact rtc-linux+owner@googlegroups.com List-Id: List-Post: List-Help: List-Unsubscribe: , X-BeenThere-Env: rtc-linux@googlegroups.com X-BeenThere: rtc-linux@googlegroups.com It looks like an early version of the WM831x RTC driver got merged into the mfd tree without fixes for some final review comments: - Consistently get interrupts by name. - Implement set_mmss() rather than set_time(). - Make the error checking a bit less excessive and noisy. - Clean up the private data structure. There shouldn't be any operational effect. Signed-off-by: Mark Brown Acked-by: Alessandro Zummo Cc: rtc-linux@googlegroups.com --- drivers/rtc/rtc-wm831x.c | 29 +++++++---------------------- 1 files changed, 7 insertions(+), 22 deletions(-) diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index 99e7845..79795cd 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c @@ -92,8 +92,7 @@ struct wm831x_rtc { struct wm831x *wm831x; struct rtc_device *rtc; - int alarm_enabled; - int per_irq; + unsigned int alarm_enabled:1; }; /* @@ -136,7 +135,7 @@ static int wm831x_rtc_readtime(struct device *dev, struct rtc_time *tm) u32 time = (time1[0] << 16) | time1[1]; rtc_time_to_tm(time, tm); - return 0; + return rtc_valid_tm(tm); } } while (++count < WM831X_GET_TIME_RETRIES); @@ -149,21 +148,15 @@ static int wm831x_rtc_readtime(struct device *dev, struct rtc_time *tm) /* * Set current time and date in RTC */ -static int wm831x_rtc_settime(struct device *dev, struct rtc_time *tm) +static int wm831x_rtc_set_mmss(struct device *dev, unsigned long time) { struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(dev); struct wm831x *wm831x = wm831x_rtc->wm831x; struct rtc_time new_tm; - unsigned long time, new_time; + unsigned long new_time; int ret; int count = 0; - ret = rtc_tm_to_time(tm, &time); - if (ret < 0) { - dev_err(dev, "Failed to convert time: %d\n", ret); - return ret; - } - ret = wm831x_reg_write(wm831x, WM831X_RTC_TIME_1, (time >> 16) & 0xffff); if (ret < 0) { @@ -356,7 +349,7 @@ static irqreturn_t wm831x_per_irq(int irq, void *data) static const struct rtc_class_ops wm831x_rtc_ops = { .read_time = wm831x_rtc_readtime, - .set_time = wm831x_rtc_settime, + .set_mmss = wm831x_rtc_set_mmss, .read_alarm = wm831x_rtc_readalarm, .set_alarm = wm831x_rtc_setalarm, .alarm_irq_enable = wm831x_rtc_alarm_irq_enable, @@ -437,7 +430,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, wm831x_rtc); wm831x_rtc->wm831x = wm831x; - wm831x_rtc->per_irq = per_irq; ret = wm831x_reg_read(wm831x, WM831X_RTC_CONTROL); if (ret < 0) { @@ -453,7 +445,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev) &wm831x_rtc_ops, THIS_MODULE); if (IS_ERR(wm831x_rtc->rtc)) { ret = PTR_ERR(wm831x_rtc->rtc); - dev_err(&pdev->dev, "Failed to register RTC: %d\n", ret); goto err; } @@ -463,7 +454,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev) if (ret != 0) { dev_err(&pdev->dev, "Failed to request periodic IRQ %d: %d\n", per_irq, ret); - goto err_rtc; } ret = wm831x_request_irq(wm831x, alm_irq, wm831x_alm_irq, @@ -472,15 +462,10 @@ static int wm831x_rtc_probe(struct platform_device *pdev) if (ret != 0) { dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n", alm_irq, ret); - goto err_per; } return 0; -err_per: - wm831x_free_irq(wm831x, per_irq, wm831x_rtc); -err_rtc: - rtc_device_unregister(wm831x_rtc->rtc); err: kfree(wm831x_rtc); return ret; @@ -489,8 +474,8 @@ err: static int __devexit wm831x_rtc_remove(struct platform_device *pdev) { struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev); - int per_irq = platform_get_irq(pdev, 0); - int alm_irq = platform_get_irq(pdev, 1); + 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);