Browse Source

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>
Daniel Lezcano 10 years ago
parent
commit
c9d6216149

+ 2 - 2
arch/arm64/include/asm/cpuidle.h

@@ -4,10 +4,10 @@
 #include <asm/proc-fns.h>
 #include <asm/proc-fns.h>
 
 
 #ifdef CONFIG_CPU_IDLE
 #ifdef CONFIG_CPU_IDLE
-extern int cpu_init_idle(unsigned int cpu);
+extern int arm_cpuidle_init(unsigned int cpu);
 extern int cpu_suspend(unsigned long arg);
 extern int cpu_suspend(unsigned long arg);
 #else
 #else
-static inline int cpu_init_idle(unsigned int cpu)
+static inline int arm_cpuidle_init(unsigned int cpu)
 {
 {
 	return -EOPNOTSUPP;
 	return -EOPNOTSUPP;
 }
 }

+ 1 - 1
arch/arm64/kernel/cpuidle.c

@@ -15,7 +15,7 @@
 #include <asm/cpuidle.h>
 #include <asm/cpuidle.h>
 #include <asm/cpu_ops.h>
 #include <asm/cpu_ops.h>
 
 
-int cpu_init_idle(unsigned int cpu)
+int arm_cpuidle_init(unsigned int cpu)
 {
 {
 	int ret = -EOPNOTSUPP;
 	int ret = -EOPNOTSUPP;
 	struct device_node *cpu_node = of_cpu_device_node_get(cpu);
 	struct device_node *cpu_node = of_cpu_device_node_get(cpu);

+ 1 - 1
drivers/cpuidle/cpuidle-arm64.c

@@ -110,7 +110,7 @@ static int __init arm64_idle_init(void)
 	 * idle states suspend back-end specific data
 	 * idle states suspend back-end specific data
 	 */
 	 */
 	for_each_possible_cpu(cpu) {
 	for_each_possible_cpu(cpu) {
-		ret = cpu_init_idle(cpu);
+		ret = arm_cpuidle_init(cpu);
 		if (ret) {
 		if (ret) {
 			pr_err("CPU %d failed to init idle CPU ops\n", cpu);
 			pr_err("CPU %d failed to init idle CPU ops\n", cpu);
 			return ret;
 			return ret;