PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()

To avoid confusion with the meaning and return value of
pm_check_wakeup_events() replace it with pm_wakeup_pending() that
will work the other way around (ie. return true when system-wide
power transition should be aborted).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 4747a1e8b44a..8a5258339ca2 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1056,7 +1056,7 @@ static int dpm_prepare(pm_message_t state)
                 if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
                         pm_wakeup_event(dev, 0);
 
-                if (!pm_check_wakeup_events()) {
+                if (pm_wakeup_pending()) {
                         pm_runtime_put_sync(dev);
                         error = -EBUSY;
                 } else {
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 71c5528e1c35..8ec406d8f548 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -542,26 +542,26 @@ static void pm_wakeup_update_hit_counts(void)
 }
 
 /**
- * pm_check_wakeup_events - Check for new wakeup events.
+ * pm_wakeup_pending - Check if power transition in progress should be aborted.
  *
  * Compare the current number of registered wakeup events with its preserved
- * value from the past to check if new wakeup events have been registered since
- * the old value was stored.  Check if the current number of wakeup events being
- * processed is zero.
+ * value from the past and return true if new wakeup events have been registered
+ * since the old value was stored.  Also return true if the current number of
+ * wakeup events being processed is different from zero.
  */
-bool pm_check_wakeup_events(void)
+bool pm_wakeup_pending(void)
 {
         unsigned long flags;
-        bool ret = true;
+        bool ret = false;
 
         spin_lock_irqsave(&events_lock, flags);
         if (events_check_enabled) {
-                ret = ((unsigned int)atomic_read(&event_count) == saved_count)
-                        && !atomic_read(&events_in_progress);
-                events_check_enabled = ret;
+                ret = ((unsigned int)atomic_read(&event_count) != saved_count)
+                        || atomic_read(&events_in_progress);
+                events_check_enabled = !ret;
         }
         spin_unlock_irqrestore(&events_lock, flags);
-        if (!ret)
+        if (ret)
                 pm_wakeup_update_hit_counts();
         return ret;
 }