From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
To: benjamin.gaignard@linaro.org
Cc: linaro-kernel@lists.linaro.org,
Linus Walleij <linus.walleij@linaro.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/51] rtc: ab8500: stop using rtc deprecated functions
Date: Tue, 20 Jun 2017 11:35:15 +0200 [thread overview]
Message-ID: <1497951359-13334-8-git-send-email-benjamin.gaignard@linaro.org> (raw)
In-Reply-To: <1497951359-13334-1-git-send-email-benjamin.gaignard@linaro.org>
rtc_time_to_tm() and rtc_tm_to_time() are deprecated because they
rely on 32bits variables and that will make rtc break in y2038/2016.
Stop using those two functions to safer 64bits ones.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
CC: Linus Walleij <linus.walleij@linaro.org>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Alexandre Belloni <alexandre.belloni@free-electrons.com>
CC: rtc-linux@googlegroups.com
CC: linux-kernel@vger.kernel.org
CC: linux-arm-kernel@lists.infradead.org
---
drivers/rtc/rtc-ab8500.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c
index 24a0af6..ac131bd 100644
--- a/drivers/rtc/rtc-ab8500.c
+++ b/drivers/rtc/rtc-ab8500.c
@@ -71,7 +71,7 @@
/* Calculate the seconds from 1970 to 01-01-2000 00:00:00 */
static unsigned long get_elapsed_seconds(int year)
{
- unsigned long secs;
+ unsigned long long secs;
struct rtc_time tm = {
.tm_year = year - 1900,
.tm_mday = 1,
@@ -81,7 +81,7 @@ static unsigned long get_elapsed_seconds(int year)
* This function calculates secs from 1970 and not from
* 1900, even if we supply the offset from year 1900.
*/
- rtc_tm_to_time(&tm, &secs);
+ secs = rtc_tm_to_time64(&tm);
return secs;
}
@@ -89,7 +89,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
unsigned long timeout = jiffies + HZ;
int retval, i;
- unsigned long mins, secs;
+ unsigned long long mins, secs;
unsigned char buf[ARRAY_SIZE(ab8500_rtc_time_regs)];
u8 value;
@@ -130,7 +130,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm)
/* Add back the initially subtracted number of seconds */
secs += get_elapsed_seconds(AB8500_RTC_EPOCH);
- rtc_time_to_tm(secs, tm);
+ rtc_time64_to_tm(secs, tm);
return rtc_valid_tm(tm);
}
@@ -138,7 +138,7 @@ static int ab8500_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
int retval, i;
unsigned char buf[ARRAY_SIZE(ab8500_rtc_time_regs)];
- unsigned long no_secs, no_mins, secs = 0;
+ unsigned long long no_secs, no_mins, secs = 0;
if (tm->tm_year < (AB8500_RTC_EPOCH - 1900)) {
dev_dbg(dev, "year should be equal to or greater than %d\n",
@@ -147,7 +147,7 @@ static int ab8500_rtc_set_time(struct device *dev, struct rtc_time *tm)
}
/* Get the number of seconds since 1970 */
- rtc_tm_to_time(tm, &secs);
+ secs = rtc_tm_to_time64(tm);
/*
* Convert it to the number of seconds since 01-01-2000 00:00:00, since
@@ -185,7 +185,7 @@ static int ab8500_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
int retval, i;
u8 rtc_ctrl, value;
unsigned char buf[ARRAY_SIZE(ab8500_rtc_alarm_regs)];
- unsigned long secs, mins;
+ unsigned long long secs, mins;
/* Check if the alarm is enabled or not */
retval = abx500_get_register_interruptible(dev, AB8500_RTC,
@@ -214,7 +214,7 @@ static int ab8500_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
/* Add back the initially subtracted number of seconds */
secs += get_elapsed_seconds(AB8500_RTC_EPOCH);
- rtc_time_to_tm(secs, &alarm->time);
+ rtc_time64_to_tm(secs, &alarm->time);
return rtc_valid_tm(&alarm->time);
}
@@ -230,7 +230,7 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{
int retval, i;
unsigned char buf[ARRAY_SIZE(ab8500_rtc_alarm_regs)];
- unsigned long mins, secs = 0, cursec = 0;
+ unsigned long long mins, secs = 0, cursec = 0;
struct rtc_time curtm;
if (alarm->time.tm_year < (AB8500_RTC_EPOCH - 1900)) {
@@ -240,7 +240,7 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
}
/* Get the number of seconds since 1970 */
- rtc_tm_to_time(&alarm->time, &secs);
+ secs = rtc_tm_to_time64(&alarm->time);
/*
* Check whether alarm is set less than 1min.
@@ -248,7 +248,7 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
* return -EINVAL, so UIE EMUL can take it up, incase of UIE_ON
*/
ab8500_rtc_read_time(dev, &curtm); /* Read current time */
- rtc_tm_to_time(&curtm, &cursec);
+ cursec = rtc_tm_to_time64(&curtm);
if ((secs - cursec) < 59) {
dev_dbg(dev, "Alarm less than 1 minute not supported\r\n");
return -EINVAL;
@@ -281,7 +281,7 @@ static int ab8540_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{
int retval, i;
unsigned char buf[ARRAY_SIZE(ab8540_rtc_alarm_regs)];
- unsigned long mins, secs = 0;
+ unsigned long long mins, secs = 0;
if (alarm->time.tm_year < (AB8500_RTC_EPOCH - 1900)) {
dev_dbg(dev, "year should be equal to or greater than %d\n",
@@ -290,7 +290,7 @@ static int ab8540_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
}
/* Get the number of seconds since 1970 */
- rtc_tm_to_time(&alarm->time, &secs);
+ secs = rtc_tm_to_time64(&alarm->time);
/*
* Convert it to the number of seconds since 01-01-2000 00:00:00
--
1.9.1
next prev parent reply other threads:[~2017-06-20 9:57 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-20 9:35 [PATCH 00/51] rtc: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 01/51] x86: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 02/51] x86: intel-mid: vrtc: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 03/51] net: broadcom: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 04/51] rtc: 88pm80x: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 05/51] rtc: 88pm860x: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 06/51] rtc: ab-b5ze-s3: " Benjamin Gaignard
2017-06-20 9:35 ` Benjamin Gaignard [this message]
2017-06-20 16:06 ` [PATCH 07/51] rtc: ab8500: " Linus Walleij
2017-06-21 6:57 ` kbuild test robot
2017-06-20 9:35 ` [PATCH 08/51] rtc: armada38x: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 09/51] rtc: at32ap700x: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 10/51] rtc: at91sam9: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 11/51] rtc: bfin: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 12/51] rtc: coh901331: " Benjamin Gaignard
2017-06-20 16:07 ` [rtc-linux] " Linus Walleij
2017-06-20 21:21 ` Russell King - ARM Linux
2017-06-20 9:35 ` [PATCH 13/51] rtc: cpcap: " Benjamin Gaignard
2017-06-21 4:37 ` kbuild test robot
2017-06-20 9:35 ` [PATCH 14/51] rtc: da9063: " Benjamin Gaignard
2017-06-20 13:41 ` Steve Twiss
2017-06-20 14:18 ` Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 15/51] " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 16/51] rtc: davinci: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 17/51] rtc: digicolor: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 18/51] rtc: dm355evm: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 19/51] rtc: ds1305: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 20/51] rtc: ds1374: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 21/51] rtc: ds1511: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 22/51] rtc: ds1553: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 23/51] rtc: ds1672: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 24/51] rtc: ds2404: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 25/51] rtc: ep93xx: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 26/51] rtc: gemini: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 27/51] rtc: imxdi: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 28/51] rtc: jz4740: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 29/51] rtc: lpc32xx: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 30/51] rtc: mv: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 31/51] rtc: omap: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 32/51] rtc: pcap: " Benjamin Gaignard
2017-06-21 4:45 ` kbuild test robot
2017-06-21 5:07 ` kbuild test robot
2017-06-20 9:35 ` [PATCH 33/51] rtc: pl030: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 34/51] rtc: pl031: " Benjamin Gaignard
2017-06-20 16:08 ` Linus Walleij
2017-06-20 21:05 ` Russell King - ARM Linux
2017-06-20 9:35 ` [PATCH 35/51] rtc: pm8xxx: " Benjamin Gaignard
2017-06-21 16:54 ` kbuild test robot
2017-07-03 10:12 ` Arnd Bergmann
2017-06-20 9:35 ` [PATCH 36/51] rtc: rs5c348: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 37/51] rtc: sa1100: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 38/51] rtc: sh: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 39/51] rtc: sirfsoc: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 40/51] rtc: snvs: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 41/51] rtc: stk17ta8: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 42/51] rtc: stmp3xxx: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 43/51] rtc: sun6i: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 44/51] rtc: sysfs: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 45/51] rtc: tegra " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 46/51] rtc: test: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 47/51] rtc: tps6586: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 48/51] rtc: vr41xx: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 49/51] rtc: wm831x: " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 50/51] rtc: xgene " Benjamin Gaignard
2017-06-20 9:35 ` [PATCH 51/51] power: suspend test: " Benjamin Gaignard
2017-06-20 12:10 ` Pavel Machek
2017-06-20 10:03 ` [PATCH 00/51] rtc: " Alexandre Belloni
2017-06-20 10:07 ` Alexandre Belloni
2017-06-20 12:10 ` Pavel Machek
2017-06-20 12:24 ` Alexandre Belloni
2017-06-20 13:26 ` Pavel Machek
2017-06-20 13:37 ` Steve Twiss
2017-06-20 13:44 ` Pavel Machek
2017-06-20 13:48 ` Alexandre Belloni
2017-06-20 15:07 ` Benjamin Gaignard
2017-06-20 21:15 ` Russell King - ARM Linux
2017-06-21 9:26 ` David Laight
2017-06-21 9:35 ` Russell King - ARM Linux
2017-06-20 22:08 ` Pavel Machek
2017-06-21 9:14 ` Benjamin Gaignard
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=1497951359-13334-8-git-send-email-benjamin.gaignard@linaro.org \
--to=benjamin.gaignard@linaro.org \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@free-electrons.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
/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
all inboxes | Powered by JetHome®