aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel/gptimers.c
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2012-05-17 14:21:22 +0800
committerBob Liu <lliubbo@gmail.com>2012-05-21 14:54:26 +0800
commit3a3cf0d7b8b0e32b5c1c4216520dfd59262742b9 (patch)
tree50bb12495a482a20e6ec787d07cfaf5e843a1e0b /arch/blackfin/kernel/gptimers.c
parentblackfin: bf60x: add power management support (diff)
downloadlinux-dev-3a3cf0d7b8b0e32b5c1c4216520dfd59262742b9.tar.xz
linux-dev-3a3cf0d7b8b0e32b5c1c4216520dfd59262742b9.zip
blackfin: bf60x: fix compiling warning
Fix several compiling warning for bf60x. Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin/kernel/gptimers.c')
-rw-r--r--arch/blackfin/kernel/gptimers.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/gptimers.c b/arch/blackfin/kernel/gptimers.c
index f7afe570f880..d776773d3869 100644
--- a/arch/blackfin/kernel/gptimers.c
+++ b/arch/blackfin/kernel/gptimers.c
@@ -332,13 +332,15 @@ static void _disable_gptimers(uint16_t mask)
void disable_gptimers(uint16_t mask)
{
+#ifndef CONFIG_BF60x
int i;
_disable_gptimers(mask);
-#ifndef CONFIG_BF60x
for (i = 0; i < MAX_BLACKFIN_GPTIMERS; ++i)
if (mask & (1 << i))
bfin_write(&group_regs[BFIN_TIMER_OCTET(i)]->status, trun_mask[i]);
SSYNC();
+#else
+ _disable_gptimers(mask);
#endif
}
EXPORT_SYMBOL(disable_gptimers);