1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 472a5adc4642..ea2a315df6b7 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -55,7 +55,7 @@ static int rtc_suspend(struct device *dev)
         struct timespec64       delta, delta_delta;
         int err;
 
-        if (has_persistent_clock())
+        if (timekeeping_rtc_skipsuspend())
                 return 0;
 
         if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
@@ -102,7 +102,7 @@ static int rtc_resume(struct device *dev)
         struct timespec64       sleep_time;
         int err;
 
-        if (has_persistent_clock())
+        if (timekeeping_rtc_skipresume())
                 return 0;
 
         rtc_hctosys_ret = -ENODEV;
@@ -117,10 +117,6 @@ static int rtc_resume(struct device *dev)
                 return 0;
         }
 
-        if (rtc_valid_tm(&tm) != 0) {
-                pr_debug("%s:  bogus resume time\n", dev_name(&rtc->dev));
-                return 0;
-        }
         new_rtc.tv_sec = rtc_tm_to_time64(&tm);
         new_rtc.tv_nsec = 0;
 
@@ -225,15 +221,15 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         rtc->pie_timer.function = rtc_pie_update_irq;
         rtc->pie_enabled = 0;
 
+        strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
+        dev_set_name(&rtc->dev, "rtc%d", id);
+
         /* Check to see if there is an ALARM already set in hw */
         err = __rtc_read_alarm(rtc, &alrm);
 
         if (!err && !rtc_valid_tm(&alrm.time))
                 rtc_initialize_alarm(rtc, &alrm);
 
-        strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
-        dev_set_name(&rtc->dev, "rtc%d", id);
-
         rtc_dev_prepare(rtc);
 
         err = device_register(&rtc->dev);