Skip to content

Commit

Permalink
msm: pm: Remove idle wakelock checking
Browse files Browse the repository at this point in the history
Now that all users of idle wakelocks are migrated to pm_qos we
can remove the idle wakelock checks from the pm code.

Change-Id: I19cca1d0b28a2943178b9d9eade2b594fd94a139
Signed-off-by: Stephen Boyd <[email protected]>
  • Loading branch information
bebarino authored and Mustaavalkosta committed Apr 5, 2013
1 parent 595edbd commit 6f58de4
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions arch/arm/mach-msm/pm2.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/memory.h>
#ifdef CONFIG_HAS_WAKELOCK
#include <linux/wakelock.h>
#endif
#include <linux/rmt_storage_client.h>
#include <mach/msm_iomap.h>
#include <mach/system.h>
Expand Down Expand Up @@ -1499,9 +1496,6 @@ void arch_idle(void)
}

if ((timer_expiration < msm_pm_idle_sleep_min_time) ||
#ifdef CONFIG_HAS_WAKELOCK
has_wake_lock(WAKE_LOCK_IDLE) ||
#endif
!msm_irq_idle_sleep_allowed()) {
allow[MSM_PM_SLEEP_MODE_POWER_COLLAPSE] = false;
allow[MSM_PM_SLEEP_MODE_POWER_COLLAPSE_NO_XO_SHUTDOWN] = false;
Expand Down

0 comments on commit 6f58de4

Please sign in to comment.