Patchwork [U-Boot,v2] mpc85xx: Fix a compiler warning when CONFIG_WATCHDOG is turned on

login
register
mail settings
Submitter Horst Kronstorfer
Date March 13, 2013, 8:14 p.m.
Message ID <1363205645-10337-1-git-send-email-hkronsto@frequentis.com>
Download mbox | patch
Permalink /patch/227351/
State Accepted, archived
Delegated to: Andy Fleming
Headers show

Comments

Horst Kronstorfer - March 13, 2013, 8:14 p.m.
cpu.c:288:2:
warning: implicit declaration of function 'reset_85xx_watchdog'
[-Wimplicit-function-declaration]

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
---
Changes for v2:
   - Fix formatting
   - Fix checkpatch findings

 arch/powerpc/cpu/mpc85xx/cpu.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index df2ab6d..6ce483e 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -282,14 +282,6 @@  unsigned long get_tbclk (void)
 
 #if defined(CONFIG_WATCHDOG)
 void
-watchdog_reset(void)
-{
-	int re_enable = disable_interrupts();
-	reset_85xx_watchdog();
-	if (re_enable) enable_interrupts();
-}
-
-void
 reset_85xx_watchdog(void)
 {
 	/*
@@ -297,6 +289,16 @@  reset_85xx_watchdog(void)
 	 */
 	mtspr(SPRN_TSR, TSR_WIS);
 }
+
+void
+watchdog_reset(void)
+{
+	int re_enable = disable_interrupts();
+
+	reset_85xx_watchdog();
+	if (re_enable)
+		enable_interrupts();
+}
 #endif	/* CONFIG_WATCHDOG */
 
 /*