Permalink
Browse files

power: Remove legacy wakelock code.

Remove parts of code that use the legacy wakelock
implementation as we make the switch to the upstream
kernel's wakeup sources-based implementation.

Change-Id: Idab9e3dd54e8a256b059c88606c9368f7ddb1c1b
Signed-off-by: Anurag Singh <anursing@codeaurora.org>

Conflicts:
	drivers/input/touchscreen/synaptics_i2c_rmi4.h
	kernel/power/Kconfig
	kernel/power/suspend.c
  • Loading branch information...
1 parent 8c3723a commit 867aa64204ab83738ed2299099b617d4daff13f7 Anurag Singh committed with zarboz Mar 11, 2013
Showing with 2 additions and 6 deletions.
  1. +1 −5 kernel/power/process.c
  2. +1 −1 kernel/power/suspend.c
View
@@ -53,10 +53,6 @@ static int try_to_freeze_tasks(bool user_only)
todo += wq_busy;
}
- if (todo && has_wake_lock(WAKE_LOCK_SUSPEND)) {
- wakeup = 1;
- break;
- }
if (!todo || time_after(jiffies, end_time))
break;
@@ -144,7 +140,7 @@ int freeze_kernel_threads(void)
{
int error;
- error = suspend_sys_sync_wait();
+ error = sys_sync();
if (error)
return error;
View
@@ -296,7 +296,7 @@ static int enter_state(suspend_state_t state)
if (state == PM_SUSPEND_FREEZE)
freeze_begin();
- suspend_sys_sync_queue();
+ sys_sync();
pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
error = suspend_prepare(state);
if (error)

0 comments on commit 867aa64

Please sign in to comment.