From 9684358fc71e009141d8c09f8c95c03ea8814a06 Mon Sep 17 00:00:00 2001 From: Bharat Nihalani Date: Wed, 19 Oct 2011 18:55:38 +0530 Subject: Revert "ARM: tegra: power: Restore cpu LP2 request statistic" This reverts commit 464da11dc8aa1dcd1ec0e0d3ba13b48730a29351. Change-Id: Ie62922afa693d3920da5b9ee96c286a3e5d886d8 Reviewed-on: http://git-master/r/59404 Reviewed-by: Ryan Wong Tested-by: Ryan Wong --- arch/arm/mach-tegra/cpuidle.c | 16 ++++++++-------- 1 file 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); -- cgit v1.2.3