Revert "power: wakelock: Print active wakelocks when has_wake_lock() is called"

This reverts commit 7175b7585f84bb8e7de5f6a1e694c3275377cecb.

diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c
index ca48bb8d316b9cfc0bf6db0c0a2c6667ceb44699..4b0e26065be09e4d7f8299b258fadb3459cfa4e0 100644 (file)
--- a/kernel/power/wakelock.c
+++ b/kernel/power/wakelock.c
@@ -208,23 +208,20 @@ static void expire_wake_lock(struct wake_lock *lock)
 /* Caller must acquire the list_lock spinlock */
 static void print_active_locks(int type)
 {
+       unsigned long irqflags;
        struct wake_lock *lock;
-       bool print_expired = true;
 
        BUG_ON(type >= WAKE_LOCK_TYPE_COUNT);
        list_for_each_entry(lock, &active_wake_locks[type], link) {
                if (lock->flags & WAKE_LOCK_AUTO_EXPIRE) {
                        long timeout = lock->expires - jiffies;
-                       if (timeout > 0)
+                       if (timeout <= 0)
+                               pr_info("wake lock %s, expired\n", lock->name);
+                       else
                                pr_info("active wake lock %s, time left %ld\n",
                                        lock->name, timeout);
-                       else if (print_expired)
-                               pr_info("wake lock %s, expired\n", lock->name);
-               } else {
+               } else
                        pr_info("active wake lock %s\n", lock->name);
-                       if (!debug_mask & DEBUG_EXPIRE)
-                               print_expired = false;
-               }
        }
 }
 
@@ -253,8 +250,6 @@ long has_wake_lock(int type)
        unsigned long irqflags;
        spin_lock_irqsave(&list_lock, irqflags);
        ret = has_wake_lock_locked(type);
-       if (ret && (debug_mask & DEBUG_SUSPEND) && type == WAKE_LOCK_SUSPEND)
-               print_active_locks(type);
        spin_unlock_irqrestore(&list_lock, irqflags);
        return ret;
 }