From bec439bcda865da0456358d4ff7cc3a064a43251 Mon Sep 17 00:00:00 2001 From: Joseph Lo Date: Tue, 2 Apr 2013 01:20:50 +0000 Subject: [PATCH] --- yaml --- r: 370615 b: refs/heads/master c: 4d82d0587b4a964ea3a7c73aa044b433000527dd h: refs/heads/master i: 370613: 54014d1439eb877bd6ea1fb52dfcedf73208f6c5 370611: 7e1571bc376511e461bce53385d87a382f3a5338 370607: 42c49fc425f2664f0decffaca5e9e9d47ef51971 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/cpuidle-tegra20.c | 6 +----- trunk/arch/arm/mach-tegra/cpuidle-tegra30.c | 6 +----- trunk/arch/arm/mach-tegra/pm.c | 2 +- trunk/arch/arm/mach-tegra/pm.h | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 830ca60d947c..f524c0b0637b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8c2e6069065fdecfb195a2c438c7faa964aef22 +refs/heads/master: 4d82d0587b4a964ea3a7c73aa044b433000527dd diff --git a/trunk/arch/arm/mach-tegra/cpuidle-tegra20.c b/trunk/arch/arm/mach-tegra/cpuidle-tegra20.c index 825ced4f7a40..8bbbdebed882 100644 --- a/trunk/arch/arm/mach-tegra/cpuidle-tegra20.c +++ b/trunk/arch/arm/mach-tegra/cpuidle-tegra20.c @@ -130,10 +130,6 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - struct cpuidle_state *state = &drv->states[index]; - u32 cpu_on_time = state->exit_latency; - u32 cpu_off_time = state->target_residency - state->exit_latency; - while (tegra20_cpu_is_resettable_soon()) cpu_relax(); @@ -142,7 +138,7 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev, clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); - tegra_idle_lp2_last(cpu_on_time, cpu_off_time); + tegra_idle_lp2_last(); clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); diff --git a/trunk/arch/arm/mach-tegra/cpuidle-tegra30.c b/trunk/arch/arm/mach-tegra/cpuidle-tegra30.c index 80445ed33d95..c0931c8bb3e5 100644 --- a/trunk/arch/arm/mach-tegra/cpuidle-tegra30.c +++ b/trunk/arch/arm/mach-tegra/cpuidle-tegra30.c @@ -72,10 +72,6 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - struct cpuidle_state *state = &drv->states[index]; - u32 cpu_on_time = state->exit_latency; - u32 cpu_off_time = state->target_residency - state->exit_latency; - /* All CPUs entering LP2 is not working. * Don't let CPU0 enter LP2 when any secondary CPU is online. */ @@ -86,7 +82,7 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev, clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); - tegra_idle_lp2_last(cpu_on_time, cpu_off_time); + tegra_idle_lp2_last(); clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); diff --git a/trunk/arch/arm/mach-tegra/pm.c b/trunk/arch/arm/mach-tegra/pm.c index 3a3318a83ad3..84d8742bdb1e 100644 --- a/trunk/arch/arm/mach-tegra/pm.c +++ b/trunk/arch/arm/mach-tegra/pm.c @@ -140,7 +140,7 @@ static int tegra_sleep_cpu(unsigned long v2p) return 0; } -void tegra_idle_lp2_last(u32 cpu_on_time, u32 cpu_off_time) +void tegra_idle_lp2_last(void) { tegra_pmc_pm_set(TEGRA_SUSPEND_LP2); diff --git a/trunk/arch/arm/mach-tegra/pm.h b/trunk/arch/arm/mach-tegra/pm.h index 73a45f181fd9..9d2d038bf12e 100644 --- a/trunk/arch/arm/mach-tegra/pm.h +++ b/trunk/arch/arm/mach-tegra/pm.h @@ -31,7 +31,7 @@ void restore_cpu_arch_register(void); void tegra_clear_cpu_in_lp2(int phy_cpu_id); bool tegra_set_cpu_in_lp2(int phy_cpu_id); -void tegra_idle_lp2_last(u32 cpu_on_time, u32 cpu_off_time); +void tegra_idle_lp2_last(void); extern void (*tegra_tear_down_cpu)(void); #ifdef CONFIG_PM_SLEEP