From b599ff7fcb262317403bb1be613ab52b9e2a07fc Mon Sep 17 00:00:00 2001 From: Patrick Cain Date: Mon, 28 Nov 2011 14:41:25 -0800 Subject: [PATCH] Revert "power: wakelock: don't set check_done flag if aborting" This reverts commit 7ef4dbaa2adcadb39b5b60051d637e0203c7b6ba. Revert "power: wakelock: BUG if wakelock is taken very late" This reverts commit 57b34bbdca587ed67ed3d6fc9a83cf3564ac770d. Change-Id: Ie1288b5e6c899ac4419c55b91cb024b8093b5ffe Signed-off-by: Patrick Cain --- kernel/power/wakelock.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c index 23dfc40f267..2583856fab3 100644 --- a/kernel/power/wakelock.c +++ b/kernel/power/wakelock.c @@ -52,8 +52,6 @@ struct workqueue_struct *suspend_work_queue; struct wake_lock main_wake_lock; suspend_state_t requested_suspend_state = PM_SUSPEND_MEM; static struct wake_lock unknown_wakeup; -/* flag to warn/bug if wakelocks are taken after suspend_noirq */ -static int msm_suspend_check_done; static struct wake_lock suspend_backoff_lock; #define SUSPEND_BACKOFF_THRESHOLD 10 @@ -412,21 +410,11 @@ static int power_suspend_late(struct device *dev) #endif if (debug_mask & DEBUG_SUSPEND) pr_info("power_suspend_late return %d\n", ret); - - if (ret == 0) - msm_suspend_check_done = 1; return ret; } -static int power_resume_early(struct device *dev) -{ - msm_suspend_check_done = 0; - return 0; -} - static struct dev_pm_ops power_driver_pm_ops = { .suspend_noirq = power_suspend_late, - .resume_noirq = power_resume_early, }; static struct platform_driver power_driver = { @@ -569,24 +557,12 @@ static void wake_lock_internal( void wake_lock(struct wake_lock *lock) { - /* - * if wake lock is being called too late in the suspend sequence, - * call bug so we get to analyze the callstack - */ - BUG_ON(msm_suspend_check_done); - wake_lock_internal(lock, 0, 0); } EXPORT_SYMBOL(wake_lock); void wake_lock_timeout(struct wake_lock *lock, long timeout) { - /* - * if wake lock is being called too late in the suspend sequence, - * call bug so we get to analyze the callstack - */ - BUG_ON(msm_suspend_check_done); - wake_lock_internal(lock, timeout, 1); } EXPORT_SYMBOL(wake_lock_timeout);