From 7343f1c0dc0d9f7ecce692e1b3fe9dc677bac43b Mon Sep 17 00:00:00 2001 From: Srinivas Rao L Date: Mon, 10 Aug 2015 16:41:23 +0530 Subject: [PATCH] msm: pm: Remove jtag save/restore from msm-pm msm-pm driver calls msm_jtag_save_state() and msm_jtag_restore_state(). However msm-pm driver is going to be deprecated when we move to PSCI framework. So remove msm_jtag_save_state and msm_jtag_restore_state from msm-pm, so that jtag driver handles this in common for both PSCI and non-PSCi targets. Change-Id: Ie9060b50aa1118b23e71dbc00ba9ca5bd363f48c Signed-off-by: Srinivas Rao L --- drivers/power/qcom/msm-pm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/power/qcom/msm-pm.c b/drivers/power/qcom/msm-pm.c index 8743c6b9c9c1..bc53571207e3 100644 --- a/drivers/power/qcom/msm-pm.c +++ b/drivers/power/qcom/msm-pm.c @@ -39,7 +39,6 @@ #ifdef CONFIG_VFP #include #endif -#include #include "idle.h" #include "pm-boot.h" #include "../../../arch/arm/mach-msm/clock.h" @@ -266,13 +265,9 @@ static bool __ref msm_pm_spm_power_collapse( pr_info("CPU%u: %s: program vector to %p\n", cpu, __func__, entry); - msm_jtag_save_state(); - collapsed = save_cpu_regs ? !__cpu_suspend(0, msm_pm_collapse) : msm_pm_pc_hotplug(); - msm_jtag_restore_state(); - if (collapsed) local_fiq_enable();