Merge tag 'ntb-4.8' of git://github.com/jonmason/ntb

[cascardo/linux.git] / arch / arm / mach-omap2 / pm.c

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 2f7b11d..678d2a3 100644 (file)
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -110,13 +110,7 @@ static void __init omap2_init_processor_devices(void)
 
 int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused)
 {
-       /* XXX The usecount test is racy */
-       if ((clkdm->flags & CLKDM_CAN_ENABLE_AUTO) &&
-           !(clkdm->flags & CLKDM_MISSING_IDLE_REPORTING))
-               clkdm_allow_idle(clkdm);
-       else if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP &&
-                clkdm->usecount == 0)
-               clkdm_sleep(clkdm);
+       clkdm_allow_idle(clkdm);
        return 0;
 }