From da01840c7dd8acc0d817d866c703ed2b23e4148a Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Wed, 21 Sep 2016 13:11:25 -0700 Subject: cpuidle: don't disable cpuidle when entering suspend cpuidle was disabled while entering suspend as part of commit 8651f97bd951d0bb1c10fa24e3fa3455193f3548 in order to work around some ACPI bugs. However, there's no reason to do this on modern platforms. Leaving cpuidle enabled can result in improved power consumption if dpm_resume_noirq runs for a significant time. Change-Id: Ie182785b176f448698c0264eba554d1e315e8a06 --- drivers/base/power/main.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/base') diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 24ebfc66c..bb2ba9c52 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -563,7 +562,6 @@ static void dpm_resume_noirq(pm_message_t state) async_synchronize_full(); dpm_show_time(starttime, state, "noirq"); resume_device_irqs(); - cpuidle_resume(); } /** @@ -1036,7 +1034,6 @@ static int dpm_suspend_noirq(pm_message_t state) char suspend_abort[MAX_SUSPEND_ABORT_LEN]; int error = 0; - cpuidle_pause(); suspend_device_irqs(); mutex_lock(&dpm_list_mtx); while (!list_empty(&dpm_late_early_list)) { -- cgit v1.2.3