OMAP2: PM debug: remove leftover debug code
PATCH 1/1 OMAP2: PM debug: remove leftover debug code
commit 20d5d5514981f9a68832bffb27a698545ecba77a left some code lying around which doesn't do anything. Clean it up.
---
It looks to me like if you remove the register dump, the debug if's don't do anything at all.
arch/arm/mach-omap2/pm24xx.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-)
arch/arm/mach-omap2/pm24xx.c +0 -27
@@ -53,8 +53,6 @@#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 )
@@ -96,7 +94,6 @@ static int omap2_fclks_active(void)static void omap2_enter_full_retention (void ) {u32 l; -struct timespec ts_preidle, ts_postidle, ts_idle;/* There is 1 reference hold for all children of the oscillator * clock, the following will remove it. If no one else uses the
@@ -124,10 +121,6 @@ static void omap2_enter_full_retention(void)omap2_gpio_prepare_for_idle (0 ); -if (omap2_pm_debug) { -getnstimeofday (&ts_preidle); - } -/* One last check for pending IRQs to avoid extra latency due * to sleeping unnecessarily. */ if (omap_irq_pending ())
@@ -155,13 +148,6 @@ static void omap2_enter_full_retention(void)console_unlock (); no_sleep: -if (omap2_pm_debug) { -unsigned long long tmp; - -getnstimeofday (&ts_postidle); - ts_idle =timespec_sub (ts_postidle, ts_preidle); - tmp =timespec_to_ns (&ts_idle) *NSEC_PER_USEC ; - }omap2_gpio_resume_after_idle ();clk_enable (osc_ck);
@@ -219,7 +205,6 @@ static int omap2_allow_mpu_retention(void)static void omap2_enter_mpu_retention (void ) {int only_idle =0 ; -struct timespec ts_preidle, ts_postidle, ts_idle;/* Putting MPU into the WFI state while a transfer is active * seems to cause the I2C block to timeout. Why? Good question. */
@@ -246,19 +231,7 @@ static void omap2_enter_mpu_retention(void) only_idle =1 ; } -if (omap2_pm_debug) { -getnstimeofday (&ts_preidle); - } -omap2_sram_idle (); - -if (omap2_pm_debug) { -unsigned long long tmp; - -getnstimeofday (&ts_postidle); - ts_idle =timespec_sub (ts_postidle, ts_preidle); - tmp =timespec_to_ns (&ts_idle) *NSEC_PER_USEC ; - } }static int omap2_can_sleep (void )
Signature · 6 lines
1.7.6 MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler Registergericht: Amtsgericht Stuttgart, HRB 271090 Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier
Quoted 2 lines · Michael Jones
commit
20d5d5514981f9a68832bffb27a698545ecba77aleft some code lying around which doesn't do anything. Clean it up.
Minor: when referencing a commit in a changelog, please also add the short log. IOW, the changelog should read:
commit 20d5d5514981f9a68832bffb27a698545ecba77a (OMAP2: PM debug:
remove register dumping) left some code lying around which doesn't do anything. Clean it up.
Quoted 5 lines
Signed-off-by Michael Jones <[email protected]>---
It looks to me like if you remove the register dump, the debug if's don't do anything at all.
You're right.
Please update the changelog and also Cc the linux-arm-kernel mailing list on the updated patch.
After that, I'll queue it for v3.2.
Thanks,
Kevin
PATCH v2 1/1 OMAP2: PM debug: remove leftover debug code
commit 20d5d5514981f9a68832bffb27a698545ecba77a (OMAP2: PM debug:
remove register dumping) left some code lying around which doesn't do anything. Clean it up.
---
Changes for v2:
- included short log text of the commit referenced in commit message
arch/arm/mach-omap2/pm24xx.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-)
arch/arm/mach-omap2/pm24xx.c +0 -27
@@ -53,8 +53,6 @@#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 )
@@ -96,7 +94,6 @@ static int omap2_fclks_active(void)static void omap2_enter_full_retention (void ) {u32 l; -struct timespec ts_preidle, ts_postidle, ts_idle;/* There is 1 reference hold for all children of the oscillator * clock, the following will remove it. If no one else uses the
@@ -124,10 +121,6 @@ static void omap2_enter_full_retention(void)omap2_gpio_prepare_for_idle (0 ); -if (omap2_pm_debug) { -getnstimeofday (&ts_preidle); - } -/* One last check for pending IRQs to avoid extra latency due * to sleeping unnecessarily. */ if (omap_irq_pending ())
@@ -155,13 +148,6 @@ static void omap2_enter_full_retention(void)console_unlock (); no_sleep: -if (omap2_pm_debug) { -unsigned long long tmp; - -getnstimeofday (&ts_postidle); - ts_idle =timespec_sub (ts_postidle, ts_preidle); - tmp =timespec_to_ns (&ts_idle) *NSEC_PER_USEC ; - }omap2_gpio_resume_after_idle ();clk_enable (osc_ck);
@@ -219,7 +205,6 @@ static int omap2_allow_mpu_retention(void)static void omap2_enter_mpu_retention (void ) {int only_idle =0 ; -struct timespec ts_preidle, ts_postidle, ts_idle;/* Putting MPU into the WFI state while a transfer is active * seems to cause the I2C block to timeout. Why? Good question. */
@@ -246,19 +231,7 @@ static void omap2_enter_mpu_retention(void) only_idle =1 ; } -if (omap2_pm_debug) { -getnstimeofday (&ts_preidle); - } -omap2_sram_idle (); - -if (omap2_pm_debug) { -unsigned long long tmp; - -getnstimeofday (&ts_postidle); - ts_idle =timespec_sub (ts_postidle, ts_preidle); - tmp =timespec_to_ns (&ts_idle) *NSEC_PER_USEC ; - } }static int omap2_can_sleep (void )
Signature · 6 lines
1.7.6 MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler Registergericht: Amtsgericht Stuttgart, HRB 271090 Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier
PATCH v2 1/1 OMAP2: PM debug: remove leftover debug code
Quoted 5 lines · Michael Jones
commit
20d5d5514981f9a68832bffb27a698545ecba77a(OMAP2: PM debug:
remove register dumping) left some code lying around which doesn't do anything. Clean it up.Signed-off-by Michael Jones <[email protected]>
Thanks, queueing for v3.2 (branch: for_3.2/pm-cleanup)
Kevin
P.S., apologies for the lag... been out on vacation.