diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm24xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm24xx.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index bf089e743ed9..cf0c216132ab 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c | |||
@@ -53,8 +53,6 @@ | |||
53 | #include "powerdomain.h" | 53 | #include "powerdomain.h" |
54 | #include "clockdomain.h" | 54 | #include "clockdomain.h" |
55 | 55 | ||
56 | static int omap2_pm_debug; | ||
57 | |||
58 | #ifdef CONFIG_SUSPEND | 56 | #ifdef CONFIG_SUSPEND |
59 | static suspend_state_t suspend_state = PM_SUSPEND_ON; | 57 | static suspend_state_t suspend_state = PM_SUSPEND_ON; |
60 | static inline bool is_suspending(void) | 58 | static inline bool is_suspending(void) |
@@ -96,7 +94,6 @@ static int omap2_fclks_active(void) | |||
96 | static void omap2_enter_full_retention(void) | 94 | static void omap2_enter_full_retention(void) |
97 | { | 95 | { |
98 | u32 l; | 96 | u32 l; |
99 | struct timespec ts_preidle, ts_postidle, ts_idle; | ||
100 | 97 | ||
101 | /* There is 1 reference hold for all children of the oscillator | 98 | /* There is 1 reference hold for all children of the oscillator |
102 | * clock, the following will remove it. If no one else uses the | 99 | * clock, the following will remove it. If no one else uses the |
@@ -124,10 +121,6 @@ static void omap2_enter_full_retention(void) | |||
124 | 121 | ||
125 | omap2_gpio_prepare_for_idle(0); | 122 | omap2_gpio_prepare_for_idle(0); |
126 | 123 | ||
127 | if (omap2_pm_debug) { | ||
128 | getnstimeofday(&ts_preidle); | ||
129 | } | ||
130 | |||
131 | /* One last check for pending IRQs to avoid extra latency due | 124 | /* One last check for pending IRQs to avoid extra latency due |
132 | * to sleeping unnecessarily. */ | 125 | * to sleeping unnecessarily. */ |
133 | if (omap_irq_pending()) | 126 | if (omap_irq_pending()) |
@@ -155,13 +148,6 @@ static void omap2_enter_full_retention(void) | |||
155 | console_unlock(); | 148 | console_unlock(); |
156 | 149 | ||
157 | no_sleep: | 150 | no_sleep: |
158 | if (omap2_pm_debug) { | ||
159 | unsigned long long tmp; | ||
160 | |||
161 | getnstimeofday(&ts_postidle); | ||
162 | ts_idle = timespec_sub(ts_postidle, ts_preidle); | ||
163 | tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC; | ||
164 | } | ||
165 | omap2_gpio_resume_after_idle(); | 151 | omap2_gpio_resume_after_idle(); |
166 | 152 | ||
167 | clk_enable(osc_ck); | 153 | clk_enable(osc_ck); |
@@ -219,7 +205,6 @@ static int omap2_allow_mpu_retention(void) | |||
219 | static void omap2_enter_mpu_retention(void) | 205 | static void omap2_enter_mpu_retention(void) |
220 | { | 206 | { |
221 | int only_idle = 0; | 207 | int only_idle = 0; |
222 | struct timespec ts_preidle, ts_postidle, ts_idle; | ||
223 | 208 | ||
224 | /* Putting MPU into the WFI state while a transfer is active | 209 | /* Putting MPU into the WFI state while a transfer is active |
225 | * seems to cause the I2C block to timeout. Why? Good question. */ | 210 | * seems to cause the I2C block to timeout. Why? Good question. */ |
@@ -246,19 +231,7 @@ static void omap2_enter_mpu_retention(void) | |||
246 | only_idle = 1; | 231 | only_idle = 1; |
247 | } | 232 | } |
248 | 233 | ||
249 | if (omap2_pm_debug) { | ||
250 | getnstimeofday(&ts_preidle); | ||
251 | } | ||
252 | |||
253 | omap2_sram_idle(); | 234 | omap2_sram_idle(); |
254 | |||
255 | if (omap2_pm_debug) { | ||
256 | unsigned long long tmp; | ||
257 | |||
258 | getnstimeofday(&ts_postidle); | ||
259 | ts_idle = timespec_sub(ts_postidle, ts_preidle); | ||
260 | tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC; | ||
261 | } | ||
262 | } | 235 | } |
263 | 236 | ||
264 | static int omap2_can_sleep(void) | 237 | static int omap2_can_sleep(void) |