summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Nihalani <bnihalani@nvidia.com>2011-10-19 18:55:38 +0530
committerSimone Willett <swillett@nvidia.com>2011-10-25 13:21:05 -0700
commit2b19c77b495b19367a86fdd2c52a07f00b92687f (patch)
tree277700d08c772780fe2615a31ec69f86d0a8f5d4
parent40fdf3442dbe00f5b38e59b8948f229d1b6aeb78 (diff)
Revert "ARM: tegra: power: Restore cpu LP2 request statistic"
This reverts commit 464da11dc8aa1dcd1ec0e0d3ba13b48730a29351. Bug 889103 Change-Id: I7e5b39db56861a1bb1baac5414691d677243cae6 Reviewed-on: http://git-master/r/59118 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/cpuidle.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c
index f64709cd84d4..252bc123f808 100644
--- a/arch/arm/mach-tegra/cpuidle.c
+++ b/arch/arm/mach-tegra/cpuidle.c
@@ -147,14 +147,14 @@ static int tegra_idle_enter_lp2(struct cpuidle_device *dev,
smp_rmb();
- /* update lp2 latency only if actually exiting from lp2 state */
- if (state == dev->last_state) {
- state->exit_latency = tegra_lp2_exit_latency;
- state->target_residency = tegra_lp2_exit_latency +
- tegra_lp2_power_off_time;
- if (state->target_residency < tegra_lp2_min_residency)
- state->target_residency = tegra_lp2_min_residency;
- }
+ if (state != dev->last_state)
+ return (int)us; /* skip lp2 stats if we've been in lp3 */
+
+ state->exit_latency = tegra_lp2_exit_latency;
+ state->target_residency = tegra_lp2_exit_latency +
+ tegra_lp2_power_off_time;
+ if (state->target_residency < tegra_lp2_min_residency)
+ state->target_residency = tegra_lp2_min_residency;
tegra_idle_stats_lp2_time(dev->cpu, us);