aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2015-02-02 10:32:46 -0500
committerDaniel Lezcano <daniel.lezcano@linaro.org>2015-03-24 05:16:09 -0400
commitc9d62161490e2b74e51bcaf2acea07e27ce833eb (patch)
tree84c18f183ea3cd9bc08c726729e31df525d30a7a /arch
parent191de17aa3c139f58e1c75af5b4fe0e166e618da (diff)
ARM64: cpuidle: Rename cpu_init_idle to a common function name
With this change the cpuidle-arm64.c file calls the same function name for both ARM and ARM64. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Kevin Hilman <khilman@linaro.org> Acked-by: Rob Herring <robherring2@gmail.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/cpuidle.h4
-rw-r--r--arch/arm64/kernel/cpuidle.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
index 460a38bb84b9..141b2fcabaa6 100644
--- a/arch/arm64/include/asm/cpuidle.h
+++ b/arch/arm64/include/asm/cpuidle.h
@@ -4,10 +4,10 @@
4#include <asm/proc-fns.h> 4#include <asm/proc-fns.h>
5 5
6#ifdef CONFIG_CPU_IDLE 6#ifdef CONFIG_CPU_IDLE
7extern int cpu_init_idle(unsigned int cpu); 7extern int arm_cpuidle_init(unsigned int cpu);
8extern int cpu_suspend(unsigned long arg); 8extern int cpu_suspend(unsigned long arg);
9#else 9#else
10static inline int cpu_init_idle(unsigned int cpu) 10static inline int arm_cpuidle_init(unsigned int cpu)
11{ 11{
12 return -EOPNOTSUPP; 12 return -EOPNOTSUPP;
13} 13}
diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c
index 5c0896647fd1..a78143a5c99f 100644
--- a/arch/arm64/kernel/cpuidle.c
+++ b/arch/arm64/kernel/cpuidle.c
@@ -15,7 +15,7 @@
15#include <asm/cpuidle.h> 15#include <asm/cpuidle.h>
16#include <asm/cpu_ops.h> 16#include <asm/cpu_ops.h>
17 17
18int cpu_init_idle(unsigned int cpu) 18int arm_cpuidle_init(unsigned int cpu)
19{ 19{
20 int ret = -EOPNOTSUPP; 20 int ret = -EOPNOTSUPP;
21 struct device_node *cpu_node = of_cpu_device_node_get(cpu); 21 struct device_node *cpu_node = of_cpu_device_node_get(cpu);