Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[pandora-kernel.git] / arch / arm / mach-omap2 / pm24xx.c

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index df3ded6..bf089e7 100644 (file)
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -53,6 +53,8 @@
 #include "powerdomain.h"
 #include "clockdomain.h"
 
+static int omap2_pm_debug;
+
 #ifdef CONFIG_SUSPEND
 static suspend_state_t suspend_state = PM_SUSPEND_ON;
 static inline bool is_suspending(void)
@@ -123,7 +125,6 @@ static void omap2_enter_full_retention(void)
        omap2_gpio_prepare_for_idle(0);
 
        if (omap2_pm_debug) {
-               omap2_pm_dump(0, 0, 0);
                getnstimeofday(&ts_preidle);
        }
 
@@ -160,7 +161,6 @@ no_sleep:
                getnstimeofday(&ts_postidle);
                ts_idle = timespec_sub(ts_postidle, ts_preidle);
                tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC;
-               omap2_pm_dump(0, 1, tmp);
        }
        omap2_gpio_resume_after_idle();
 
@@ -247,7 +247,6 @@ static void omap2_enter_mpu_retention(void)
        }
 
        if (omap2_pm_debug) {
-               omap2_pm_dump(only_idle ? 2 : 1, 0, 0);
                getnstimeofday(&ts_preidle);
        }
 
@@ -259,7 +258,6 @@ static void omap2_enter_mpu_retention(void)
                getnstimeofday(&ts_postidle);
                ts_idle = timespec_sub(ts_postidle, ts_preidle);
                tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC;
-               omap2_pm_dump(only_idle ? 2 : 1, 1, tmp);
        }
 }