Revert "msm: pm-8x60: Merge msm_pm_idle_prepare into msm_pm_idle_enter"
This reverts commit 269e15494da6d37756e5c0253242dd72a3a28ebe. The
rs_limits flag isn't updated for the lowest power mode. It was fixed on
kernel 3.7 branch. Reverting this change would allow cherry-picking the
3.7 patch without any conflicts.
Change-Id: I7ac20b603bed34dc596eca9b3723b332e188d6d6
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
diff --git a/arch/arm/mach-msm/pm.h b/arch/arm/mach-msm/pm.h
index 43bb7de..399194a 100644
--- a/arch/arm/mach-msm/pm.h
+++ b/arch/arm/mach-msm/pm.h
@@ -108,9 +108,10 @@
};
void msm_pm_set_platform_data(struct msm_pm_platform_data *data, int count);
-enum msm_pm_sleep_mode msm_pm_idle_enter(struct cpuidle_device *dev,
+int msm_pm_idle_prepare(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index);
void msm_pm_set_irq_extns(struct msm_pm_irq_calls *irq_calls);
+int msm_pm_idle_enter(enum msm_pm_sleep_mode sleep_mode);
void msm_pm_cpu_enter_lowpower(unsigned int cpu);
void __init msm_pm_set_tz_retention_flag(unsigned int flag);
void msm_pm_enable_retention(bool enable);