From patchwork Thu Mar 19 10:10:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 13034 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2JADJKp003974 for ; Thu, 19 Mar 2009 10:13:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751932AbZCSKNS (ORCPT ); Thu, 19 Mar 2009 06:13:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752541AbZCSKNS (ORCPT ); Thu, 19 Mar 2009 06:13:18 -0400 Received: from wa-out-1112.google.com ([209.85.146.182]:29265 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752233AbZCSKNR (ORCPT ); Thu, 19 Mar 2009 06:13:17 -0400 Received: by wa-out-1112.google.com with SMTP id j5so310007wah.21 for ; Thu, 19 Mar 2009 03:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=PL9/zJ9pe4g5K8xhHdKs58PERieyj8CAKSRW7k6Dwqs=; b=o7co4Ju5Of2Gv6aCIaA/odmz5LBECa6Db6PLFG+nHel/ZestfbCCGPkoGGz78XpMYC ZxIbKg+WnyQZtcBr78YcxSZxa2444nm4KluwF/bXqhDe7nOJ3ZBHxMfgsttF6h7QKiKl kAfxK/Nv49iR7YEF8ZYy9iHLa273CvCEindRM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=aoDsSJ/RJ4Z8vZ/UpxccC/p3+soXmrpbA4ugRYIfpJ+hnM9jtbT34B5YsjClbXzwXY +rHg64C1yN73wUkelNHKL7yOHl8XKeq8aR4tEcwrAgbmpPNVMtT+peciThLxjIGHxbWQ NqXOKOX9qF4/MQbYYvZg5cmtj3Egp2hHTKNyo= Received: by 10.114.181.13 with SMTP id d13mr1525915waf.109.1237457595547; Thu, 19 Mar 2009 03:13:15 -0700 (PDT) Received: from rx1.opensource.se (210.5.32.202.bf.2iij.net [202.32.5.210]) by mx.google.com with ESMTPS id m25sm974172waf.44.2009.03.19.03.13.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 19 Mar 2009 03:13:14 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Thu, 19 Mar 2009 19:10:44 +0900 Message-Id: <20090319101044.9839.71473.sendpatchset@rx1.opensource.se> Subject: [PATCH] sh: sh-rtc invalid time rework Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm This patch modifies invalid time handling in the SuperH RTC driver. Instead of zeroing the returned value at read-out time we just return an error code and reset invalid values during probe. Signed-off-by: Magnus Damm --- drivers/rtc/rtc-sh.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0008/drivers/rtc/rtc-sh.c +++ work/drivers/rtc/rtc-sh.c 2009-03-19 18:39:23.000000000 +0900 @@ -431,12 +431,7 @@ static int sh_rtc_read_time(struct devic tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday); - if (rtc_valid_tm(tm) < 0) { - dev_err(dev, "invalid date\n"); - rtc_time_to_tm(0, tm); - } - - return 0; + return rtc_valid_tm(tm); } static int sh_rtc_set_time(struct device *dev, struct rtc_time *tm) @@ -641,6 +636,7 @@ static int __devinit sh_rtc_probe(struct { struct sh_rtc *rtc; struct resource *res; + struct rtc_time r; int ret; rtc = kzalloc(sizeof(struct sh_rtc), GFP_KERNEL); @@ -752,6 +748,13 @@ static int __devinit sh_rtc_probe(struct sh_rtc_setpie(&pdev->dev, 0); sh_rtc_setaie(&pdev->dev, 0); sh_rtc_setcie(&pdev->dev, 0); + + /* reset rtc to epoch 0 if time is invalid */ + if (rtc_read_time(rtc->rtc_dev, &r) < 0) { + rtc_time_to_tm(0, &r); + rtc_set_time(rtc->rtc_dev, &r); + } + return 0; err_unmap: