diff options
| author | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-11-15 16:22:29 +0800 |
|---|---|---|
| committer | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-11-16 10:10:56 +0800 |
| commit | be7ea36db6fcbe6cab165109fca4ede3b31eb160 (patch) | |
| tree | 9a002b7cde4b6b84f18a24deb31bdcf540b44496 | |
| parent | 5544b604a2fae66ff60d4ccc1c861839f0e7105a (diff) | |
ENGR00162191 tzic: move print info to suspend function
tzic_enable_wake() will also called when mx5 enter
lp mode.
Move it to suspend_enter function to reduce log.
Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx5/pm.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/tzic.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mx5/pm.c b/arch/arm/mach-mx5/pm.c index 1162990c4bc2..d2274819e807 100644 --- a/arch/arm/mach-mx5/pm.c +++ b/arch/arm/mach-mx5/pm.c @@ -85,8 +85,10 @@ static int mx5_suspend_enter(suspend_state_t state) return -EINVAL; } - if (tzic_enable_wake(0) != 0) + if (tzic_enable_wake(0) != 0) { + printk(KERN_INFO "tzic: can't enter suspend when still have Interrupt!\n"); return -EAGAIN; + } if (state == PM_SUSPEND_MEM) { if (!cpu_is_mx53()) { diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c index 6513a63d792e..dc5dee2896c6 100644 --- a/arch/arm/plat-mxc/tzic.c +++ b/arch/arm/plat-mxc/tzic.c @@ -167,10 +167,8 @@ int tzic_enable_wake(int is_idle) unsigned int i, v; __raw_writel(1, TZIC_DSMINT); - if (unlikely(__raw_readl(TZIC_DSMINT) == 0)) { - printk(KERN_INFO "tzic: can't enter suspend when still have Interrupt!\n"); + if (unlikely(__raw_readl(TZIC_DSMINT) == 0)) return -EAGAIN; - } if (likely(is_idle)) { for (i = 0; i < 4; i++) { |