Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9d62161 authored Feb 02, 2015 by Daniel Lezcano

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>

parent 191de17a

arch/arm64/include/asm/cpuidle.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

arch/arm64/kernel/cpuidle.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/cpuidle/cpuidle-arm64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;