6 files changed, 24 insertions, 32 deletions

diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
index 4aa60d74004e..6c719f23520a 100644
--- a/drivers/rtc/hctosys.c
+++ b/drivers/rtc/hctosys.c
@@ -26,7 +26,7 @@ static int __init rtc_hctosys(void)
 {
         int err = -ENODEV;
         struct rtc_time tm;
-        struct timespec tv = {
+        struct timespec64 tv64 = {
                 .tv_nsec = NSEC_PER_SEC >> 1,
         };
         struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
@@ -45,25 +45,17 @@ static int __init rtc_hctosys(void)
 
         }
 
-        err = rtc_valid_tm(&tm);
-        if (err) {
-                dev_err(rtc->dev.parent,
-                        "hctosys: invalid date/time\n");
-                goto err_invalid;
-        }
-
-        rtc_tm_to_time(&tm, &tv.tv_sec);
+        tv64.tv_sec = rtc_tm_to_time64(&tm);
 
-        err = do_settimeofday(&tv);
+        err = do_settimeofday64(&tv64);
 
         dev_info(rtc->dev.parent,
                 "setting system clock to "
-                "%d-%02d-%02d %02d:%02d:%02d UTC (%u)\n",
+                "%d-%02d-%02d %02d:%02d:%02d UTC (%lld)\n",
                 tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
                 tm.tm_hour, tm.tm_min, tm.tm_sec,
-                (unsigned int) tv.tv_sec);
+                (long long) tv64.tv_sec);
 
-err_invalid:
 err_read:
         rtc_class_close(rtc);
 
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 45bfc28ee3aa..37215cf983e9 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -73,10 +73,8 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
         else if (rtc->ops->set_time)
                 err = rtc->ops->set_time(rtc->dev.parent, tm);
         else if (rtc->ops->set_mmss) {
-                unsigned long secs;
-                err = rtc_tm_to_time(tm, &secs);
-                if (err == 0)
-                        err = rtc->ops->set_mmss(rtc->dev.parent, secs);
+                time64_t secs64 = rtc_tm_to_time64(tm);
+                err = rtc->ops->set_mmss(rtc->dev.parent, secs64);
         } else
                 err = -EINVAL;
 
@@ -105,7 +103,7 @@ int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs)
 
                 err = rtc->ops->read_time(rtc->dev.parent, &old);
                 if (err == 0) {
-                        rtc_time_to_tm(secs, &new);
+                        rtc_time64_to_tm(secs, &new);
 
                         /*
                          * avoid writing when we're going to change the day of
@@ -157,7 +155,7 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
         int err;
         struct rtc_time before, now;
         int first_time = 1;
-        unsigned long t_now, t_alm;
+        time64_t t_now, t_alm;
         enum { none, day, month, year } missing = none;
         unsigned days;
 
@@ -258,8 +256,8 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
         }
 
         /* with luck, no rollover is needed */
-        rtc_tm_to_time(&now, &t_now);
-        rtc_tm_to_time(&alarm->time, &t_alm);
+        t_now = rtc_tm_to_time64(&now);
+        t_alm = rtc_tm_to_time64(&alarm->time);
         if (t_now < t_alm)
                 goto done;
 
@@ -273,7 +271,7 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
         case day:
                 dev_dbg(&rtc->dev, "alarm rollover: %s\n", "day");
                 t_alm += 24 * 60 * 60;
-                rtc_time_to_tm(t_alm, &alarm->time);
+                rtc_time64_to_tm(t_alm, &alarm->time);
                 break;
 
         /* Month rollover ... if it's the 31th, an alarm on the 3rd will
@@ -346,19 +344,19 @@ EXPORT_SYMBOL_GPL(rtc_read_alarm);
 static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
 {
         struct rtc_time tm;
-        long now, scheduled;
+        time64_t now, scheduled;
         int err;
 
         err = rtc_valid_tm(&alarm->time);
         if (err)
                 return err;
-        rtc_tm_to_time(&alarm->time, &scheduled);
+        scheduled = rtc_tm_to_time64(&alarm->time);
 
         /* Make sure we're not setting alarms in the past */
         err = __rtc_read_time(rtc, &tm);
         if (err)
                 return err;
-        rtc_tm_to_time(&tm, &now);
+        now = rtc_tm_to_time64(&tm);
         if (scheduled <= now)
                 return -ETIME;
         /*
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index d04939369251..799c34bcb26f 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -304,12 +304,12 @@ static long rtc_dev_ioctl(struct file *file,
                  * Not supported here.
                  */
                 {
-                        unsigned long now, then;
+                        time64_t now, then;
 
                         err = rtc_read_time(rtc, &tm);
                         if (err < 0)
                                 return err;
-                        rtc_tm_to_time(&tm, &now);
+                        now = rtc_tm_to_time64(&tm);
 
                         alarm.time.tm_mday = tm.tm_mday;
                         alarm.time.tm_mon = tm.tm_mon;
@@ -317,11 +317,11 @@ static long rtc_dev_ioctl(struct file *file,
                         err  = rtc_valid_tm(&alarm.time);
                         if (err < 0)
                                 return err;
-                        rtc_tm_to_time(&alarm.time, &then);
+                        then = rtc_tm_to_time64(&alarm.time);
 
                         /* alarm may need to wrap into tomorrow */
                         if (then < now) {
-                                rtc_time_to_tm(now + 24 * 60 * 60, &tm);
+                                rtc_time64_to_tm(now + 24 * 60 * 60, &tm);
                                 alarm.time.tm_mday = tm.tm_mday;
                                 alarm.time.tm_mon = tm.tm_mon;
                                 alarm.time.tm_year = tm.tm_year;
diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c
index b37b0c80bd5a..cb989cd00b14 100644
--- a/drivers/rtc/rtc-efi.c
+++ b/drivers/rtc/rtc-efi.c
@@ -218,6 +218,7 @@ static int __init efi_rtc_probe(struct platform_device *dev)
         if (IS_ERR(rtc))
                 return PTR_ERR(rtc);
 
+        rtc->uie_unsupported = 1;
         platform_set_drvdata(dev, rtc);
 
         return 0;
diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index b5e7c4670205..89ac1d5083c6 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -832,6 +832,7 @@ static SIMPLE_DEV_PM_OPS(s5m_rtc_pm_ops, s5m_rtc_suspend, s5m_rtc_resume);
 static const struct platform_device_id s5m_rtc_id[] = {
         { "s5m-rtc",            S5M8767X },
         { "s2mps14-rtc",        S2MPS14X },
+        { },
 };
 
 static struct platform_driver s5m_rtc_driver = {
diff --git a/drivers/rtc/systohc.c b/drivers/rtc/systohc.c
index bf3e242ccc5c..eb71872d0361 100644
--- a/drivers/rtc/systohc.c
+++ b/drivers/rtc/systohc.c
@@ -20,16 +20,16 @@
  *
  * If temporary failure is indicated the caller should try again 'soon'
  */
-int rtc_set_ntp_time(struct timespec now)
+int rtc_set_ntp_time(struct timespec64 now)
 {
         struct rtc_device *rtc;
         struct rtc_time tm;
         int err = -ENODEV;
 
         if (now.tv_nsec < (NSEC_PER_SEC >> 1))
-                rtc_time_to_tm(now.tv_sec, &tm);
+                rtc_time64_to_tm(now.tv_sec, &tm);
         else
-                rtc_time_to_tm(now.tv_sec + 1, &tm);
+                rtc_time64_to_tm(now.tv_sec + 1, &tm);
 
         rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
         if (rtc) {