diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-15 21:16:21 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-05-16 14:10:53 -0700 |
| commit | 7d684ff8a9d0a12ce2a62a5842e3b01f686bac85 (patch) | |
| tree | 937cde8aefb254949253c9c1991220424be4de2a /arch/arm/mach-omap1/pm.c | |
| parent | d8c270a874e9586ca8c8f888e47a9e3b8878dca9 (diff) | |
| download | blackbird-op-linux-7d684ff8a9d0a12ce2a62a5842e3b01f686bac85.tar.gz blackbird-op-linux-7d684ff8a9d0a12ce2a62a5842e3b01f686bac85.zip | |
ARM: OMAP: remove some dead code
A check for CONFIG_CBUS_TAHVO_USB was added in v2.6.17. The related
Kconfig symbol has never been part of the tree. Remove that check.
Replace the while (...) loop with a simple if (...) statement, while
we're at it.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index dbee729e3b6d..34b4c0044961 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -123,19 +123,8 @@ void omap1_pm_idle(void) #warning Enable 32kHz OS timer in order to allow sleep states in idle use_idlect1 = use_idlect1 & ~(1 << 9); #else - - while (enable_dyn_sleep) { - -#ifdef CONFIG_CBUS_TAHVO_USB - extern int vbus_active; - /* Clock requirements? */ - if (vbus_active) - break; -#endif + if (enable_dyn_sleep) do_sleep = 1; - break; - } - #endif #ifdef CONFIG_OMAP_DM_TIMER |
