Re: [PATCH] rtc: Use time64_t variables to set time/alarm from sysfs

[Alexandre Belloni]

On 09/11/2017 at 15:09:20 +0800, Baolin Wang wrote:
> Use time64_t variables and related APIs for sysfs interfaces to
> support setting time or alarm after the year 2038 on 32-bit system.
> 
> Signed-off-by: Baolin Wang 
> ---
>  drivers/rtc/rtc-sysfs.c |   25 +
>  1 file changed, 13 insertions(+), 12 deletions(-)
> 
Applied, thanks.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Re: [PATCH] rtc: Use time64_t variables to set time/alarm from sysfs

[Alexandre Belloni]

On 09/11/2017 at 15:09:20 +0800, Baolin Wang wrote:
> Use time64_t variables and related APIs for sysfs interfaces to
> support setting time or alarm after the year 2038 on 32-bit system.
> 
> Signed-off-by: Baolin Wang 
> ---
>  drivers/rtc/rtc-sysfs.c |   25 +
>  1 file changed, 13 insertions(+), 12 deletions(-)
> 
Applied, thanks.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Re: [PATCH] rtc: Use time64_t variables to set time/alarm from sysfs

[Arnd Bergmann]

On Thu, Nov 9, 2017 at 8:09 AM, Baolin Wang  wrote:
> Use time64_t variables and related APIs for sysfs interfaces to
> support setting time or alarm after the year 2038 on 32-bit system.
>
> Signed-off-by: Baolin Wang 


Looks good,

Reviewed-by: Arnd Bergmann 

Re: [PATCH] rtc: Use time64_t variables to set time/alarm from sysfs

[Arnd Bergmann]

On Thu, Nov 9, 2017 at 8:09 AM, Baolin Wang  wrote:
> Use time64_t variables and related APIs for sysfs interfaces to
> support setting time or alarm after the year 2038 on 32-bit system.
>
> Signed-off-by: Baolin Wang 


Looks good,

Reviewed-by: Arnd Bergmann 

[PATCH] rtc: Use time64_t variables to set time/alarm from sysfs

[Baolin Wang]

Use time64_t variables and related APIs for sysfs interfaces to
support setting time or alarm after the year 2038 on 32-bit system.

Signed-off-by: Baolin Wang 
---
 drivers/rtc/rtc-sysfs.c |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index e364550..92ff2ed 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -72,9 +72,10 @@
 
retval = rtc_read_time(to_rtc_device(dev), );
if (retval == 0) {
-   unsigned long time;
-   rtc_tm_to_time(, );
-   retval = sprintf(buf, "%lu\n", time);
+   time64_t time;
+
+   time = rtc_tm_to_time64();
+   retval = sprintf(buf, "%lld\n", time);
}
 
return retval;
@@ -132,7 +133,7 @@
 wakealarm_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
ssize_t retval;
-   unsigned long alarm;
+   time64_t alarm;
struct rtc_wkalrm alm;
 
/* Don't show disabled alarms.  For uniformity, RTC alarms are
@@ -145,8 +146,8 @@
 */
retval = rtc_read_alarm(to_rtc_device(dev), );
if (retval == 0 && alm.enabled) {
-   rtc_tm_to_time(, );
-   retval = sprintf(buf, "%lu\n", alarm);
+   alarm = rtc_tm_to_time64();
+   retval = sprintf(buf, "%lld\n", alarm);
}
 
return retval;
@@ -157,8 +158,8 @@
const char *buf, size_t n)
 {
ssize_t retval;
-   unsigned long now, alarm;
-   unsigned long push = 0;
+   time64_t now, alarm;
+   time64_t push = 0;
struct rtc_wkalrm alm;
struct rtc_device *rtc = to_rtc_device(dev);
const char *buf_ptr;
@@ -170,7 +171,7 @@
retval = rtc_read_time(rtc, );
if (retval < 0)
return retval;
-   rtc_tm_to_time(, );
+   now = rtc_tm_to_time64();
 
buf_ptr = buf;
if (*buf_ptr == '+') {
@@ -181,7 +182,7 @@
} else
adjust = 1;
}
-   retval = kstrtoul(buf_ptr, 0, );
+   retval = kstrtos64(buf_ptr, 0, );
if (retval)
return retval;
if (adjust) {
@@ -197,7 +198,7 @@
return retval;
if (alm.enabled) {
if (push) {
-   rtc_tm_to_time(, );
+   push = rtc_tm_to_time64();
alarm += push;
} else
return -EBUSY;
@@ -212,7 +213,7 @@
 */
alarm = now + 300;
}
-   rtc_time_to_tm(alarm, );
+   rtc_time64_to_tm(alarm, );
 
retval = rtc_set_alarm(rtc, );
return (retval < 0) ? retval : n;
-- 
1.7.9.5

[PATCH] rtc: Use time64_t variables to set time/alarm from sysfs

[Baolin Wang]

Use time64_t variables and related APIs for sysfs interfaces to
support setting time or alarm after the year 2038 on 32-bit system.

Signed-off-by: Baolin Wang 
---
 drivers/rtc/rtc-sysfs.c |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index e364550..92ff2ed 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -72,9 +72,10 @@
 
retval = rtc_read_time(to_rtc_device(dev), );
if (retval == 0) {
-   unsigned long time;
-   rtc_tm_to_time(, );
-   retval = sprintf(buf, "%lu\n", time);
+   time64_t time;
+
+   time = rtc_tm_to_time64();
+   retval = sprintf(buf, "%lld\n", time);
}
 
return retval;
@@ -132,7 +133,7 @@
 wakealarm_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
ssize_t retval;
-   unsigned long alarm;
+   time64_t alarm;
struct rtc_wkalrm alm;
 
/* Don't show disabled alarms.  For uniformity, RTC alarms are
@@ -145,8 +146,8 @@
 */
retval = rtc_read_alarm(to_rtc_device(dev), );
if (retval == 0 && alm.enabled) {
-   rtc_tm_to_time(, );
-   retval = sprintf(buf, "%lu\n", alarm);
+   alarm = rtc_tm_to_time64();
+   retval = sprintf(buf, "%lld\n", alarm);
}
 
return retval;
@@ -157,8 +158,8 @@
const char *buf, size_t n)
 {
ssize_t retval;
-   unsigned long now, alarm;
-   unsigned long push = 0;
+   time64_t now, alarm;
+   time64_t push = 0;
struct rtc_wkalrm alm;
struct rtc_device *rtc = to_rtc_device(dev);
const char *buf_ptr;
@@ -170,7 +171,7 @@
retval = rtc_read_time(rtc, );
if (retval < 0)
return retval;
-   rtc_tm_to_time(, );
+   now = rtc_tm_to_time64();
 
buf_ptr = buf;
if (*buf_ptr == '+') {
@@ -181,7 +182,7 @@
} else
adjust = 1;
}
-   retval = kstrtoul(buf_ptr, 0, );
+   retval = kstrtos64(buf_ptr, 0, );
if (retval)
return retval;
if (adjust) {
@@ -197,7 +198,7 @@
return retval;
if (alm.enabled) {
if (push) {
-   rtc_tm_to_time(, );
+   push = rtc_tm_to_time64();
alarm += push;
} else
return -EBUSY;
@@ -212,7 +213,7 @@
 */
alarm = now + 300;
}
-   rtc_time_to_tm(alarm, );
+   rtc_time64_to_tm(alarm, );
 
retval = rtc_set_alarm(rtc, );
return (retval < 0) ? retval : n;
-- 
1.7.9.5