diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-20 18:20:47 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-20 18:20:47 -0800 |
| commit | ccaae273c3f92d7e7acb796d6747077a93dcca4b (patch) | |
| tree | 3b3853db3d4b0db18c9cbc51469538aa767aeaee /arch/arm/mach-omap2/pm-debug.c | |
| parent | fa8d1d6c2a72659f773f919c4356b68884c875d0 (diff) | |
| parent | 6b34f9d4e60a4fb9f847533a207e31316603e840 (diff) | |
| download | kernel-crypto-ccaae273c3f92d7e7acb796d6747077a93dcca4b.tar.gz kernel-crypto-ccaae273c3f92d7e7acb796d6747077a93dcca4b.tar.xz kernel-crypto-ccaae273c3f92d7e7acb796d6747077a93dcca4b.zip | |
Merge branch 'pm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/pm-debug.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm-debug.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index 860b755d222..a0866268aa4 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -54,8 +54,6 @@ int omap2_pm_debug; regs[reg_count++].val = \ __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off))) -static int __init pm_dbg_init(void); - void omap2_pm_dump(int mode, int resume, unsigned int us) { struct reg { @@ -167,6 +165,8 @@ struct dentry *pm_dbg_dir; static int pm_dbg_init_done; +static int __init pm_dbg_init(void); + enum { DEBUG_FILE_COUNTERS = 0, DEBUG_FILE_TIMERS, @@ -488,9 +488,11 @@ int pm_dbg_regset_init(int reg_set) static int pwrdm_suspend_get(void *data, u64 *val) { - *val = omap3_pm_get_suspend_state((struct powerdomain *)data); + int ret; + ret = omap3_pm_get_suspend_state((struct powerdomain *)data); + *val = ret; - if (*val >= 0) + if (ret >= 0) return 0; return *val; } @@ -604,6 +606,4 @@ static int __init pm_dbg_init(void) } arch_initcall(pm_dbg_init); -#else -void pm_dbg_update_time(struct powerdomain *pwrdm, int prev) {} #endif |