diff --git a/drivers/power/qcom/msm-pm.c b/drivers/power/qcom/msm-pm.c
index e61ba0aa8418..efd2d2537a6b 100644
--- a/drivers/power/qcom/msm-pm.c
+++ b/drivers/power/qcom/msm-pm.c
@@ -40,7 +40,6 @@
 #ifdef CONFIG_VFP
 #include <asm/vfp.h>
 #endif
-#include <soc/qcom/jtag.h>
 #include "idle.h"
 #include "pm-boot.h"
 #include "../../../arch/arm/mach-msm/clock.h"
@@ -267,13 +266,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();