From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
To: benjamin.gaignard@linaro.org
Cc: linaro-kernel@lists.linaro.org,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org
Subject: [PATCH 06/51] rtc: ab-b5ze-s3: stop using rtc deprecated functions
Date: Tue, 20 Jun 2017 11:35:14 +0200 [thread overview]
Message-ID: <1497951359-13334-7-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: 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
---
drivers/rtc/rtc-ab-b5ze-s3.c | 45 +++++++++++++-------------------------------
1 file changed, 13 insertions(+), 32 deletions(-)
diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c
index a319bf1..ce37997 100644
--- a/drivers/rtc/rtc-ab-b5ze-s3.c
+++ b/drivers/rtc/rtc-ab-b5ze-s3.c
@@ -328,7 +328,7 @@ static int _abb5zes3_rtc_read_timer(struct device *dev,
struct abb5zes3_rtc_data *data = dev_get_drvdata(dev);
struct rtc_time rtc_tm, *alarm_tm = &alarm->time;
u8 regs[ABB5ZES3_TIMA_SEC_LEN + 1];
- unsigned long rtc_secs;
+ unsigned long long rtc_secs;
unsigned int reg;
u8 timer_secs;
int ret;
@@ -352,9 +352,7 @@ static int _abb5zes3_rtc_read_timer(struct device *dev,
goto err;
/* ... convert to seconds ... */
- ret = rtc_tm_to_time(&rtc_tm, &rtc_secs);
- if (ret)
- goto err;
+ rtc_secs = rtc_tm_to_time64(&rtc_tm);
/* ... add remaining timer A time ... */
ret = sec_from_timer_a(&timer_secs, regs[1], regs[2]);
@@ -362,7 +360,7 @@ static int _abb5zes3_rtc_read_timer(struct device *dev,
goto err;
/* ... and convert back. */
- rtc_time_to_tm(rtc_secs + timer_secs, alarm_tm);
+ rtc_time64_to_tm(rtc_secs + timer_secs, alarm_tm);
ret = regmap_read(data->regmap, ABB5ZES3_REG_CTRL2, ®);
if (ret) {
@@ -383,7 +381,7 @@ static int _abb5zes3_rtc_read_alarm(struct device *dev,
{
struct abb5zes3_rtc_data *data = dev_get_drvdata(dev);
struct rtc_time rtc_tm, *alarm_tm = &alarm->time;
- unsigned long rtc_secs, alarm_secs;
+ unsigned long long rtc_secs, alarm_secs;
u8 regs[ABB5ZES3_ALRM_SEC_LEN];
unsigned int reg;
int ret;
@@ -414,13 +412,8 @@ static int _abb5zes3_rtc_read_alarm(struct device *dev,
alarm_tm->tm_year = rtc_tm.tm_year;
alarm_tm->tm_mon = rtc_tm.tm_mon;
- ret = rtc_tm_to_time(&rtc_tm, &rtc_secs);
- if (ret)
- goto err;
-
- ret = rtc_tm_to_time(alarm_tm, &alarm_secs);
- if (ret)
- goto err;
+ rtc_secs = rtc_tm_to_time64(&rtc_tm);
+ alarm_secs = rtc_tm_to_time64(alarm_tm);
if (alarm_secs < rtc_secs) {
if (alarm_tm->tm_mon == 11) {
@@ -477,7 +470,7 @@ static int _abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{
struct abb5zes3_rtc_data *data = dev_get_drvdata(dev);
struct rtc_time *alarm_tm = &alarm->time;
- unsigned long rtc_secs, alarm_secs;
+ unsigned long long rtc_secs, alarm_secs;
u8 regs[ABB5ZES3_ALRM_SEC_LEN];
struct rtc_time rtc_tm;
int ret, enable = 1;
@@ -486,13 +479,8 @@ static int _abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
if (ret)
goto err;
- ret = rtc_tm_to_time(&rtc_tm, &rtc_secs);
- if (ret)
- goto err;
-
- ret = rtc_tm_to_time(alarm_tm, &alarm_secs);
- if (ret)
- goto err;
+ rtc_secs = rtc_tm_to_time64(&rtc_tm);
+ alarm_secs = rtc_tm_to_time64(alarm_tm);
/* If alarm time is before current time, disable the alarm */
if (!alarm->enabled || alarm_secs <= rtc_secs) {
@@ -511,9 +499,7 @@ static int _abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
rtc_tm.tm_mon += 1;
}
- ret = rtc_tm_to_time(&rtc_tm, &rtc_secs);
- if (ret)
- goto err;
+ rtc_secs = rtc_tm_to_time64(&rtc_tm);
if (alarm_secs > rtc_secs) {
dev_err(dev, "%s: alarm maximum is one month in the "
@@ -597,7 +583,7 @@ static int abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{
struct abb5zes3_rtc_data *data = dev_get_drvdata(dev);
struct rtc_time *alarm_tm = &alarm->time;
- unsigned long rtc_secs, alarm_secs;
+ unsigned long long rtc_secs, alarm_secs;
struct rtc_time rtc_tm;
int ret;
@@ -606,13 +592,8 @@ static int abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
if (ret)
goto err;
- ret = rtc_tm_to_time(&rtc_tm, &rtc_secs);
- if (ret)
- goto err;
-
- ret = rtc_tm_to_time(alarm_tm, &alarm_secs);
- if (ret)
- goto err;
+ rtc_secs = rtc_tm_to_time64(&rtc_tm);
+ alarm_secs = rtc_tm_to_time64(alarm_tm);
/* Let's first disable both the alarm and the timer interrupts */
ret = _abb5zes3_rtc_update_alarm(dev, false);
--
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 ` Benjamin Gaignard [this message]
2017-06-20 9:35 ` [PATCH 07/51] rtc: ab8500: " Benjamin Gaignard
2017-06-20 16:06 ` 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-7-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=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®