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>

diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
index 460a38bb84b9618a3b50452a2b16a935188962a9..141b2fcabaa67e50294ba85ad5f218dfc1acac0d 100644 (file)
--- a/arch/arm64/include/asm/cpuidle.h
+++ b/arch/arm64/include/asm/cpuidle.h
@@ -4,10 +4,10 @@
 #include <asm/proc-fns.h>
 
 #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);
 #else
-static inline int cpu_init_idle(unsigned int cpu)
+static inline int arm_cpuidle_init(unsigned int cpu)
 {
        return -EOPNOTSUPP;
 }

diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c
index 5c0896647fd14e83e3d410e450e7085894c24484..a78143a5c99ffb2c9a7ae69267ef3c7f3256c024 100644 (file)
--- a/arch/arm64/kernel/cpuidle.c
+++ b/arch/arm64/kernel/cpuidle.c
@@ -15,7 +15,7 @@
 #include <asm/cpuidle.h>
 #include <asm/cpu_ops.h>
 
-int cpu_init_idle(unsigned int cpu)
+int arm_cpuidle_init(unsigned int cpu)
 {
        int ret = -EOPNOTSUPP;
        struct device_node *cpu_node = of_cpu_device_node_get(cpu);

diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c
index 0cea24410d895dbdcdb90365bd0ee41307f311bc..6ef291c7046fbca157fc8d37922d0ec195d864f3 100644 (file)
--- a/drivers/cpuidle/cpuidle-arm64.c
+++ b/drivers/cpuidle/cpuidle-arm64.c
@@ -110,7 +110,7 @@ static int __init arm64_idle_init(void)
         * idle states suspend back-end specific data
         */
        for_each_possible_cpu(cpu) {
-               ret = cpu_init_idle(cpu);
+               ret = arm_cpuidle_init(cpu);
                if (ret) {
                        pr_err("CPU %d failed to init idle CPU ops\n", cpu);
                        return ret;