summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/psci.c
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2015-06-18 15:41:32 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2015-06-19 14:46:39 +0100
commitaf391b15f7b56ce19f52862d36595637dd42b575 (patch)
tree582ee110ca1414b2b24d06f45a9b0718e814aa24 /arch/arm64/kernel/psci.c
parent4e2ee96a63d434177ad1785208fe06858ebfe739 (diff)
downloadlinux-af391b15f7b56ce19f52862d36595637dd42b575.tar.gz
linux-af391b15f7b56ce19f52862d36595637dd42b575.tar.bz2
linux-af391b15f7b56ce19f52862d36595637dd42b575.zip
arm64: kernel: rename __cpu_suspend to keep it aligned with arm
This patch renames __cpu_suspend to cpu_suspend so that it's aligned with ARM32. It also removes the redundant wrapper created. This is in preparation to implement generic PSCI system suspend using the cpu_{suspend,resume} which now has the same interface on both ARM and ARM64. Cc: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Ashwin Chaugule <ashwin.chaugule@linaro.org> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/psci.c')
-rw-r--r--arch/arm64/kernel/psci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index 20521377c4b3..869f202748e8 100644
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@ -574,7 +574,7 @@ static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index)
if (!psci_power_state_loses_context(state[index - 1]))
ret = psci_ops.cpu_suspend(state[index - 1], 0);
else
- ret = __cpu_suspend(index, psci_suspend_finisher);
+ ret = cpu_suspend(index, psci_suspend_finisher);
return ret;
}