Skip to content

Commit

Permalink
ARM64: cpuidle: Rename cpu_init_idle to a common function name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Lezcano committed Mar 24, 2015
1 parent 191de17 commit c9d6216
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/arm64/include/asm/cpuidle.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/kernel/cpuidle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/cpuidle/cpuidle-arm64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c9d6216

Please sign in to comment.