Received: by 10.223.185.116 with SMTP id b49csp1162341wrg; Wed, 21 Feb 2018 13:15:12 -0800 (PST) X-Google-Smtp-Source: AH8x225tnf8EgUCvUnh4HgaA4W27FZyxREfANpyBKy3qSB447MxL3wIHSaBnhXRHKX+A1Ajsv2fZ X-Received: by 10.98.49.7 with SMTP id x7mr4578198pfx.101.1519247712184; Wed, 21 Feb 2018 13:15:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519247712; cv=none; d=google.com; s=arc-20160816; b=DnvIjerbVcox68QZcmqHpkfDsZS+0stIKQ5zwbmFOqnqHjsZiT9ta84cgbKvXGSD8B zyqqFtWuPVOiqEl3tZ34QtoifUfTPlivBdCQ9VKZS4kneWgfYxotx7qqa0YrUKwmiaIP Wy6+CR5JGPRy87Yz+RvGopCVl/NKEXl/mio4i5bezEB2vYS8rptO103aeASl4bZTyAih 98vb0vRLWlAoR9PaMU9vBWtRsUhH/GcJVKbLFcSHPz1BHs4jSzM0T/ZBggpmvU6q7g15 cB6PbaLgGMQ0xcV19gzt9ZKGFeb+Ls6ywW4n3LtlmcXFeAsX5OeCvp22BnvVVcScdlky +ObQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=r5lH50WXreYN00gvpWd5T5RmE2fKnlCeFL7Ljzt9LHk=; b=gRCblr93aoP4nrOWmCkRwnZd4bmnDC2p8XKh3KHUj8Z/DlS/cpPCfTVuI2Dy1Q73Yt aoZFNa4mGLdmbFQu2cOteoRhzVbtYgYGYUt7ioKpjNul/jyTy8CSSXzm/9iJGbCSSLad GVHYTtSbW/gwS+usq7uT+9sCz9OZtxydL5BRdPTqjvTXe/7LE46XesWvtqpVBUOy3dpF rUeqL5GizuaDC+8mPzjXW+8gwRCNevMszsZdCsRYld8RXFB4Tb7NBbrLRPLtIc11ntCe 1JNXExXLs7KbIRh6DJh8SO8zwknqjayIpRQM+QyptEM3ZGnGMWQjNIWTv0HN/sPJTHEw dGKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r20si1684420pgu.423.2018.02.21.13.14.57; Wed, 21 Feb 2018 13:15:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752053AbeBUVNk (ORCPT + 99 others); Wed, 21 Feb 2018 16:13:40 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:47018 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751737AbeBUU5g (ORCPT ); Wed, 21 Feb 2018 15:57:36 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id 7BB0F20815; Wed, 21 Feb 2018 21:57:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (unknown [88.191.26.124]) by mail.free-electrons.com (Postfix) with ESMTPSA id 447C920852; Wed, 21 Feb 2018 21:57:05 +0100 (CET) From: Alexandre Belloni To: linux-rtc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexandre Belloni Subject: [PATCH 050/100] rtc: nuc900: stop validating rtc_time in .read_time Date: Wed, 21 Feb 2018 21:55:45 +0100 Message-Id: <20180221205635.31314-51-alexandre.belloni@bootlin.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180221205635.31314-1-alexandre.belloni@bootlin.com> References: <20180221205635.31314-1-alexandre.belloni@bootlin.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The RTC core is always calling rtc_valid_tm after the read_time callback. It is not necessary to call it before returning from the callback. Signed-off-by: Alexandre Belloni --- drivers/rtc/rtc-nuc900.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c index 4ed81117cf5f..7da664a77181 100644 --- a/drivers/rtc/rtc-nuc900.c +++ b/drivers/rtc/rtc-nuc900.c @@ -102,8 +102,8 @@ static int *check_rtc_access_enable(struct nuc900_rtc *nuc900_rtc) return NULL; } -static int nuc900_rtc_bcd2bin(unsigned int timereg, - unsigned int calreg, struct rtc_time *tm) +static void nuc900_rtc_bcd2bin(unsigned int timereg, + unsigned int calreg, struct rtc_time *tm) { tm->tm_mday = bcd2bin(calreg >> 0); tm->tm_mon = bcd2bin(calreg >> 8); @@ -112,8 +112,6 @@ static int nuc900_rtc_bcd2bin(unsigned int timereg, tm->tm_sec = bcd2bin(timereg >> 0); tm->tm_min = bcd2bin(timereg >> 8); tm->tm_hour = bcd2bin(timereg >> 16); - - return rtc_valid_tm(tm); } static void nuc900_rtc_bin2bcd(struct device *dev, struct rtc_time *settm, @@ -156,7 +154,9 @@ static int nuc900_rtc_read_time(struct device *dev, struct rtc_time *tm) timeval = __raw_readl(rtc->rtc_reg + REG_RTC_TLR); clrval = __raw_readl(rtc->rtc_reg + REG_RTC_CLR); - return nuc900_rtc_bcd2bin(timeval, clrval, tm); + nuc900_rtc_bcd2bin(timeval, clrval, tm); + + return 0; } static int nuc900_rtc_set_time(struct device *dev, struct rtc_time *tm) @@ -189,7 +189,9 @@ static int nuc900_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) timeval = __raw_readl(rtc->rtc_reg + REG_RTC_TAR); carval = __raw_readl(rtc->rtc_reg + REG_RTC_CAR); - return nuc900_rtc_bcd2bin(timeval, carval, &alrm->time); + nuc900_rtc_bcd2bin(timeval, carval, &alrm->time); + + return rtc_valid_tm(&alrm->time); } static int nuc900_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) -- 2.16.1