1 files changed, 14 insertions, 28 deletions

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 01a7df5317c1..dc4c2748bbc3 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -21,16 +21,13 @@
 #include "rtc-core.h"
 
 
-static DEFINE_IDR(rtc_idr);
-static DEFINE_MUTEX(idr_lock);
+static DEFINE_IDA(rtc_ida);
 struct class *rtc_class;
 
 static void rtc_device_release(struct device *dev)
 {
         struct rtc_device *rtc = to_rtc_device(dev);
-        mutex_lock(&idr_lock);
-        idr_remove(&rtc_idr, rtc->id);
-        mutex_unlock(&idr_lock);
+        ida_simple_remove(&rtc_ida, rtc->id);
         kfree(rtc);
 }
 
@@ -66,7 +63,7 @@ static int rtc_suspend(struct device *dev, pm_message_t mesg)
          */
         delta = timespec_sub(old_system, old_rtc);
         delta_delta = timespec_sub(delta, old_delta);
-        if (abs(delta_delta.tv_sec)  >= 2) {
+        if (delta_delta.tv_sec < -2 || delta_delta.tv_sec >= 2) {
                 /*
                  * if delta_delta is too large, assume time correction
                  * has occured and set old_delta to the current delta.
@@ -100,9 +97,8 @@ static int rtc_resume(struct device *dev)
         rtc_tm_to_time(&tm, &new_rtc.tv_sec);
         new_rtc.tv_nsec = 0;
 
-        if (new_rtc.tv_sec <= old_rtc.tv_sec) {
-                if (new_rtc.tv_sec < old_rtc.tv_sec)
-                        pr_debug("%s:  time travel!\n", dev_name(&rtc->dev));
+        if (new_rtc.tv_sec < old_rtc.tv_sec) {
+                pr_debug("%s:  time travel!\n", dev_name(&rtc->dev));
                 return 0;
         }
 
@@ -119,7 +115,8 @@ static int rtc_resume(struct device *dev)
         sleep_time = timespec_sub(sleep_time,
                         timespec_sub(new_system, old_system));
 
-        timekeeping_inject_sleeptime(&sleep_time);
+        if (sleep_time.tv_sec >= 0)
+                timekeeping_inject_sleeptime(&sleep_time);
         return 0;
 }
 
@@ -146,25 +143,16 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         struct rtc_wkalrm alrm;
         int id, err;
 
-        if (idr_pre_get(&rtc_idr, GFP_KERNEL) == 0) {
-                err = -ENOMEM;
+        id = ida_simple_get(&rtc_ida, 0, 0, GFP_KERNEL);
+        if (id < 0) {
+                err = id;
                 goto exit;
         }
 
-
-        mutex_lock(&idr_lock);
-        err = idr_get_new(&rtc_idr, NULL, &id);
-        mutex_unlock(&idr_lock);
-
-        if (err < 0)
-                goto exit;
-
-        id = id & MAX_ID_MASK;
-
         rtc = kzalloc(sizeof(struct rtc_device), GFP_KERNEL);
         if (rtc == NULL) {
                 err = -ENOMEM;
-                goto exit_idr;
+                goto exit_ida;
         }
 
         rtc->id = id;
@@ -222,10 +210,8 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
 exit_kfree:
         kfree(rtc);
 
-exit_idr:
-        mutex_lock(&idr_lock);
-        idr_remove(&rtc_idr, id);
-        mutex_unlock(&idr_lock);
+exit_ida:
+        ida_simple_remove(&rtc_ida, id);
 
 exit:
         dev_err(dev, "rtc core: unable to register %s, err = %d\n",
@@ -276,7 +262,7 @@ static void __exit rtc_exit(void)
 {
         rtc_dev_exit();
         class_destroy(rtc_class);
-        idr_destroy(&rtc_idr);
+        ida_destroy(&rtc_ida);
 }
 
 subsys_initcall(rtc_init);