android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog: Intel SCU Watchdog: Fix build and remove duplicate code

Browse Source 
Trying to build the Intel SCU Watchdog fails for me with gcc 4.6.0 -
$ gcc --version | head -n 1
gcc (GCC) 4.6.0 20110513 (prerelease)

like this :
  CC      drivers/watchdog/intel_scu_watchdog.o
In file included from drivers/watchdog/intel_scu_watchdog.c:49:0:
/home/jj/src/linux-2.6/arch/x86/include/asm/apb_timer.h: In function ‘apbt_time_init’:
/home/jj/src/linux-2.6/arch/x86/include/asm/apb_timer.h:65:42: warning: ‘return’ with a value, in function returning void [enabled by default]
drivers/watchdog/intel_scu_watchdog.c: In function ‘intel_scu_watchdog_init’:
drivers/watchdog/intel_scu_watchdog.c:468:2: error: implicit declaration of function ‘sfi_get_mtmr’ [-Werror=implicit-function-declaration]
drivers/watchdog/intel_scu_watchdog.c:468:32: warning: assignment makes pointer from integer without a cast [enabled by default]
cc1: some warnings being treated as errors

make[1]: *** [drivers/watchdog/intel_scu_watchdog.o] Error 1
make: *** [drivers/watchdog/intel_scu_watchdog.o] Error 2

Additionally, linux/types.h is needlessly being included twice in 
drivers/watchdog/intel_scu_watchdog.c

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Jesper Juhl 2011-05-26 11:12:53 +02:00 committed by Wim Van Sebroeck
parent db98f89a28
commit e376fd664b
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/apb_timer.h
View File

@ -62,7 +62,7 @@ extern int sfi_mtimer_num;
#else /* CONFIG_APB_TIMER */ #else /* CONFIG_APB_TIMER */
static inline unsigned long apbt_quick_calibrate(void) {return 0; } static inline unsigned long apbt_quick_calibrate(void) {return 0; }
static inline void apbt_time_init(void) {return 0; } static inline void apbt_time_init(void) { }
#endif #endif
#endif /* ASM_X86_APBT_H */ #endif /* ASM_X86_APBT_H */

3
drivers/watchdog/Kconfig
View File

@ -535,8 +535,7 @@ config I6300ESB_WDT
config INTEL_SCU_WATCHDOG config INTEL_SCU_WATCHDOG
bool "Intel SCU Watchdog for Mobile Platforms" bool "Intel SCU Watchdog for Mobile Platforms"
depends on WATCHDOG depends on X86_MRST
depends on INTEL_SCU_IPC
---help--- ---help---
Hardware driver for the watchdog time built into the Intel SCU Hardware driver for the watchdog time built into the Intel SCU
for Intel Mobile Platforms. for Intel Mobile Platforms.

1
drivers/watchdog/intel_scu_watchdog.c
View File

@ -42,7 +42,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/sfi.h> #include <linux/sfi.h>
#include <linux/types.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/intel_scu_ipc.h> #include <asm/intel_scu_ipc.h>