diff options
author | Bo Yan <byan@nvidia.com> | 2012-10-26 09:33:53 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:40:16 -0700 |
commit | 610ff59bee60a7ec3eabf0a6eb1bdf57c02b8f5f (patch) | |
tree | f6c8600c32043831fe1da7694019da8d33751c49 /arch/arm/mach-tegra/cpuidle-t11x.c | |
parent | b15f282ea56086d5e6303f2e9d8809af59bdd0ab (diff) |
ARM: tegra: replace tegra_cpu_wfi with cpu_do_idle
Function "cpu_do_idle" is defined in ARM common code, there is no need
for "tegra_cpu_wfi" which has the identical implementation.
Change-Id: I8ca3ada171990148162276a76434aebd2bd188e2
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/159157
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Rebase-Id: Rd6a6fc2bab5af491f65b018cc4bd4cecfdd2b60b
Diffstat (limited to 'arch/arm/mach-tegra/cpuidle-t11x.c')
-rw-r--r-- | arch/arm/mach-tegra/cpuidle-t11x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/cpuidle-t11x.c b/arch/arm/mach-tegra/cpuidle-t11x.c index 4290b3135080..aa8e50ef1240 100644 --- a/arch/arm/mach-tegra/cpuidle-t11x.c +++ b/arch/arm/mach-tegra/cpuidle-t11x.c @@ -198,7 +198,7 @@ static bool tegra_cpu_cluster_power_down(struct cpuidle_device *dev, if (request < state->target_residency) { /* Not enough time left to enter LP2 */ - tegra_cpu_wfi(); + cpu_do_idle(); return false; } @@ -219,7 +219,7 @@ static bool tegra_cpu_cluster_power_down(struct cpuidle_device *dev, if (!tegra_rail_off_is_allowed()) { /* Yes, re-enable the distributor and clock gating. */ tegra_gic_dist_enable(); - tegra_cpu_wfi(); + cpu_do_idle(); return false; } @@ -239,7 +239,7 @@ static bool tegra_cpu_cluster_power_down(struct cpuidle_device *dev, if (request < state->target_residency) { /* Not enough time left to enter LP2 */ tegra_gic_dist_enable(); - tegra_cpu_wfi(); + cpu_do_idle(); return false; } @@ -337,7 +337,7 @@ static bool tegra_cpu_core_power_down(struct cpuidle_device *dev, if ((timer_context.cntp_ctl & ARCH_TIMER_CTRL_ENABLE) && ~(timer_context.cntp_ctl & ARCH_TIMER_CTRL_IT_MASK)) { if (timer_context.cntp_tval <= 0) { - tegra_cpu_wfi(); + cpu_do_idle(); return false; } request = div_u64((u64)timer_context.cntp_tval * @@ -361,7 +361,7 @@ static bool tegra_cpu_core_power_down(struct cpuidle_device *dev, /* * Not enough time left to enter LP2, or wake timer not ready */ - tegra_cpu_wfi(); + cpu_do_idle(); return false; } |