arm: sc8830: remove build warnings

[profile/mobile/platform/kernel/u-boot-tm1.git] / arch / arm / cpu / armv7 / sc8830 / watchdog_hal.c

diff --git a/arch/arm/cpu/armv7/sc8830/watchdog_hal.c b/arch/arm/cpu/armv7/sc8830/watchdog_hal.c
index 8a0629c..c232703 100644 (file)
--- a/arch/arm/cpu/armv7/sc8830/watchdog_hal.c
+++ b/arch/arm/cpu/armv7/sc8830/watchdog_hal.c
@@ -19,6 +19,7 @@
 /**---------------------------------------------------------------------------*
  **                         Dependencies                                      *
  **---------------------------------------------------------------------------*/
+#include <common.h>
 #include <asm/arch/sci_types.h>
 #include <asm/arch/sc_reg.h>
 #include <asm/arch/os_api.h>
@@ -44,7 +45,6 @@ PUBLIC void WDG_TimerStop
 )
 {
     WDG_CONFIG_T config;
-    int32        ret;
 
     WDG_TRACE ("Watch Dog Trace: WDG_TimerStop");
     WDG_PHY_INT_CLR();
@@ -53,7 +53,7 @@ PUBLIC void WDG_TimerStop
     config.mode     = WDG_TIMEOUT_MODE_RESET;
     config.val      = WDG_MAX_COUNT;
 
-    ret = WDG_PHY_CONFIG (&config);
+    WDG_PHY_CONFIG (&config);
 
     return;
 }
@@ -70,7 +70,6 @@ PUBLIC void WDG_TimerStart
 )
 {
     WDG_CONFIG_T config;
-    int32        ret;
 
     WDG_TRACE ("Watch Dog Trace: WDG_TimerStart");
 
@@ -78,7 +77,7 @@ PUBLIC void WDG_TimerStart
     config.mode     = WDG_TIMEOUT_MODE_RESET;
     config.val      = init_val;
 
-    ret = WDG_PHY_CONFIG (&config);
+    WDG_PHY_CONFIG (&config);
 
 }
 
@@ -100,8 +99,6 @@ PUBLIC void WDG_TimerHandler (uint32 int_num)
 PUBLIC void WDG_TimerInit (void)
 {
     WDG_CONFIG_T config;
-    uint32       status;
-    int32        ret;
 
     WDG_TRACE ("Watch Dog Trace: WDG_TimerInit");
 
@@ -109,7 +106,7 @@ PUBLIC void WDG_TimerInit (void)
     config.mode     = WDG_TIMEOUT_MODE_RESET;
     config.val      = WDG_INIT_COUNT;
 
-    ret = WDG_PHY_CONFIG (&config);
+    WDG_PHY_CONFIG (&config);
 }
 
 /*****************************************************************************/
@@ -120,14 +117,13 @@ PUBLIC void WDG_TimerInit (void)
 PUBLIC void WDG_ResetMCU (void)
 {
     WDG_CONFIG_T config;
-    int32        ret;
 
     WDG_TRACE ("Watch Dog Trace: WDG_ResetMCU");
     config.state    = WDG_TIMER_STATE_START ;
     config.mode     = WDG_TIMEOUT_MODE_RESET;
     config.val      = 0x50;
 
-    ret = WDG_PHY_CONFIG (&config);
+    WDG_PHY_CONFIG (&config);
 }
 
 /*****************************************************************************/
@@ -138,15 +134,14 @@ PUBLIC void WDG_ResetMCU (void)
 PUBLIC void WDG_TimerLoad (uint32 time_ms)
 {
     WDG_CONFIG_T config;
-    int32        ret;
 
-    WDG_TRACE ("Watch Dog Trace: WDG_TimerLoad %d", time_ms);
+    WDG_TRACE ("Watch Dog Trace: WDG_TimerLoad %lu", time_ms);
 
     config.state    = WDG_TIMER_STATE_KEEP  ;
     config.mode     = WDG_TIMEOUT_MODE_KEEP ;
     config.val      = (time_ms * 1000) / 30;
 
-    ret = WDG_PHY_CONFIG (&config);
+    WDG_PHY_CONFIG (&config);
 }
 
 PUBLIC uint32 WDG_PHY_RST_INT_ON(void)
@@ -154,7 +149,7 @@ PUBLIC uint32 WDG_PHY_RST_INT_ON(void)
        uint32 ret = 0;
        uint32 val = 0;
        val = WDG_PHY_RST_RAW_INT();
-       printf("hw watchdog int raw status 0x%x\n", val);
+       printf("hw watchdog int raw status 0x%lx\n", val);
        ret = val & WDG_INT_RST_BIT;
        WDG_PHY_INT_CLR();
        return ret;