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 04/51] rtc: 88pm80x: stop using rtc deprecated functions
Date: Tue, 20 Jun 2017 11:35:12 +0200 [thread overview]
Message-ID: <1497951359-13334-5-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-88pm80x.c | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c
index 466bf7f..1898e9b 100644
--- a/drivers/rtc/rtc-88pm80x.c
+++ b/drivers/rtc/rtc-88pm80x.c
@@ -90,8 +90,8 @@ static int pm80x_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now,
struct rtc_time *alrm)
{
- unsigned long next_time;
- unsigned long now_time;
+ unsigned long long next_time;
+ unsigned long long now_time;
next->tm_year = now->tm_year;
next->tm_mon = now->tm_mon;
@@ -100,13 +100,13 @@ static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now,
next->tm_min = alrm->tm_min;
next->tm_sec = alrm->tm_sec;
- rtc_tm_to_time(now, &now_time);
- rtc_tm_to_time(next, &next_time);
+ now_time = rtc_tm_to_time64(now);
+ next_time = rtc_tm_to_time64(next);
if (next_time < now_time) {
/* Advance one day */
next_time += 60 * 60 * 24;
- rtc_time_to_tm(next_time, next);
+ rtc_time64_to_tm(next_time, next);
}
}
@@ -114,7 +114,7 @@ static int pm80x_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
struct pm80x_rtc_info *info = dev_get_drvdata(dev);
unsigned char buf[4];
- unsigned long ticks, base, data;
+ unsigned long long ticks, base, data;
regmap_raw_read(info->map, PM800_RTC_EXPIRE2_1, buf, 4);
base = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
dev_dbg(info->dev, "%x-%x-%x-%x\n", buf[0], buf[1], buf[2], buf[3]);
@@ -123,9 +123,9 @@ static int pm80x_rtc_read_time(struct device *dev, struct rtc_time *tm)
regmap_raw_read(info->map, PM800_RTC_COUNTER1, buf, 4);
data = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
ticks = base + data;
- dev_dbg(info->dev, "get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",
+ dev_dbg(info->dev, "get base:0x%llx, RO count:0x%llx, ticks:0x%llx\n",
base, data, ticks);
- rtc_time_to_tm(ticks, tm);
+ rtc_time64_to_tm(ticks, tm);
return 0;
}
@@ -133,20 +133,20 @@ static int pm80x_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
struct pm80x_rtc_info *info = dev_get_drvdata(dev);
unsigned char buf[4];
- unsigned long ticks, base, data;
+ unsigned long long ticks, base, data;
if ((tm->tm_year < 70) || (tm->tm_year > 138)) {
dev_dbg(info->dev,
"Set time %d out of range. Please set time between 1970 to 2038.\n",
1900 + tm->tm_year);
return -EINVAL;
}
- rtc_tm_to_time(tm, &ticks);
+ ticks = rtc_tm_to_time64(tm);
/* load 32-bit read-only counter */
regmap_raw_read(info->map, PM800_RTC_COUNTER1, buf, 4);
data = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
base = ticks - data;
- dev_dbg(info->dev, "set base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",
+ dev_dbg(info->dev, "set base:0x%llx, RO count:0x%llx, ticks:0x%llx\n",
base, data, ticks);
buf[0] = base & 0xFF;
buf[1] = (base >> 8) & 0xFF;
@@ -161,7 +161,7 @@ static int pm80x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
{
struct pm80x_rtc_info *info = dev_get_drvdata(dev);
unsigned char buf[4];
- unsigned long ticks, base, data;
+ unsigned long long ticks, base, data;
int ret;
regmap_raw_read(info->map, PM800_RTC_EXPIRE2_1, buf, 4);
@@ -171,10 +171,10 @@ static int pm80x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
regmap_raw_read(info->map, PM800_RTC_EXPIRE1_1, buf, 4);
data = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
ticks = base + data;
- dev_dbg(info->dev, "get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",
+ dev_dbg(info->dev, "get base:0x%llx, RO count:0x%llx, ticks:0x%llx\n",
base, data, ticks);
- rtc_time_to_tm(ticks, &alrm->time);
+ rtc_time64_to_tm(ticks, &alrm->time);
regmap_read(info->map, PM800_RTC_CONTROL, &ret);
alrm->enabled = (ret & PM800_ALARM1_EN) ? 1 : 0;
alrm->pending = (ret & (PM800_ALARM | PM800_ALARM_WAKEUP)) ? 1 : 0;
@@ -185,7 +185,7 @@ static int pm80x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
{
struct pm80x_rtc_info *info = dev_get_drvdata(dev);
struct rtc_time now_tm, alarm_tm;
- unsigned long ticks, base, data;
+ unsigned long long ticks, base, data;
unsigned char buf[4];
int mask;
@@ -199,15 +199,15 @@ static int pm80x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
regmap_raw_read(info->map, PM800_RTC_COUNTER1, buf, 4);
data = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
ticks = base + data;
- dev_dbg(info->dev, "get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",
+ dev_dbg(info->dev, "get base:0x%llx, RO count:0x%llx, ticks:0x%llx\n",
base, data, ticks);
- rtc_time_to_tm(ticks, &now_tm);
- dev_dbg(info->dev, "%s, now time : %lu\n", __func__, ticks);
+ rtc_time64_to_tm(ticks, &now_tm);
+ dev_dbg(info->dev, "%s, now time : %llu\n", __func__, ticks);
rtc_next_alarm_time(&alarm_tm, &now_tm, &alrm->time);
/* get new ticks for alarm in 24 hours */
- rtc_tm_to_time(&alarm_tm, &ticks);
- dev_dbg(info->dev, "%s, alarm time: %lu\n", __func__, ticks);
+ ticks = rtc_tm_to_time64(&alarm_tm);
+ dev_dbg(info->dev, "%s, alarm time: %llu\n", __func__, ticks);
data = ticks - base;
buf[0] = data & 0xff;
@@ -255,7 +255,7 @@ static int pm80x_rtc_probe(struct platform_device *pdev)
struct pm80x_rtc_info *info;
struct device_node *node = pdev->dev.of_node;
struct rtc_time tm;
- unsigned long ticks = 0;
+ unsigned long long ticks = 0;
int ret;
if (!pdata && !node) {
@@ -320,7 +320,7 @@ static int pm80x_rtc_probe(struct platform_device *pdev)
goto out_rtc;
}
}
- rtc_tm_to_time(&tm, &ticks);
+ ticks = rtc_tm_to_time64(&tm);
info->rtc_dev = devm_rtc_device_register(&pdev->dev, "88pm80x-rtc",
&pm80x_rtc_ops, THIS_MODULE);
--
1.9.1
next prev parent reply other threads:[~2017-06-20 9:37 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 ` Benjamin Gaignard [this message]
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 ` [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-5-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®