From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: linux-rtc@vger.kernel.org
Cc: Paul Cercueil <paul@crapouillou.net>,
Mathieu Malaterre <malat@debian.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [PATCH 2/7] rtc: jz4740: switch to rtc_time64_to_tm/rtc_tm_to_time64
Date: Thu, 18 Apr 2019 12:00:40 +0200 [thread overview]
Message-ID: <20190418100045.29288-2-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20190418100045.29288-1-alexandre.belloni@bootlin.com>
Call the 64bit versions of rtc_tm time conversion now that the range is
enforced by the core.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-jz4740.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c
index 079469627bd7..15b6832f3931 100644
--- a/drivers/rtc/rtc-jz4740.c
+++ b/drivers/rtc/rtc-jz4740.c
@@ -171,7 +171,7 @@ static int jz4740_rtc_read_time(struct device *dev, struct rtc_time *time)
if (timeout == 0)
return -EIO;
- rtc_time_to_tm(secs, time);
+ rtc_time64_to_tm(secs, time);
return 0;
}
@@ -196,7 +196,7 @@ static int jz4740_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
alrm->enabled = !!(ctrl & JZ_RTC_CTRL_AE);
alrm->pending = !!(ctrl & JZ_RTC_CTRL_AF);
- rtc_time_to_tm(secs, &alrm->time);
+ rtc_time64_to_tm(secs, &alrm->time);
return rtc_valid_tm(&alrm->time);
}
@@ -205,9 +205,7 @@ static int jz4740_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
{
int ret;
struct jz4740_rtc *rtc = dev_get_drvdata(dev);
- unsigned long secs;
-
- rtc_tm_to_time(&alrm->time, &secs);
+ unsigned long secs = rtc_tm_to_time64(&alrm->time);
ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC_ALARM, secs);
if (!ret)
--
2.20.1
next prev parent reply other threads:[~2019-04-18 10:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-18 10:00 [PATCH 1/7] rtc: jz4740: set range Alexandre Belloni
2019-04-18 10:00 ` Alexandre Belloni [this message]
2019-04-26 14:29 ` [PATCH 2/7] rtc: jz4740: switch to rtc_time64_to_tm/rtc_tm_to_time64 Mathieu Malaterre
2019-04-26 14:38 ` Alexandre Belloni
2019-04-18 10:00 ` [PATCH 3/7] rtc: jz4740: remove useless check Alexandre Belloni
2019-04-18 10:00 ` [PATCH 4/7] rtc: jz4740: use .set_time Alexandre Belloni
2019-04-18 10:00 ` [PATCH 5/7] rtc: jz4740: use dev_pm_set_wake_irq() to simplify code Alexandre Belloni
2019-04-18 10:00 ` [PATCH 6/7] rtc: jz4740: rework invalid time detection Alexandre Belloni
2019-04-18 10:00 ` [PATCH 7/7] rtc: jz4740: convert to SPDX identifier Alexandre Belloni
2019-04-26 14:31 ` [PATCH 1/7] rtc: jz4740: set range Mathieu Malaterre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190418100045.29288-2-alexandre.belloni@bootlin.com \
--to=alexandre.belloni@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=malat@debian.org \
--cc=paul@crapouillou.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).