On Fri, Mar 20, 2015 at 11:43:57AM +0000, Daniel Lezcano wrote:
> 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@xxxxxxxxxx>
> Acked-by: Kevin Hilman <khilman@xxxxxxxxxx>
> Acked-by: Rob Herring <robherring2@xxxxxxxxx>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> ---
> arch/arm64/include/asm/cpuidle.h | 4 ++--
> arch/arm64/kernel/cpuidle.c | 2 +-
> drivers/cpuidle/cpuidle-arm64.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
> index 460a38b..141b2fc 100644
> --- 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 5c08966..a78143a 100644
> --- 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 0cea244..6ef291c7 100644
> --- 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;
> --
> 1.9.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
