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>

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index dbee729..34b4c00 100644 (file)
--- 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