Commit e376fd66 authored May 26, 2011 by Jesper Juhl Committed by Wim Van Sebroeck Jun 28, 2011

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



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>

parent db98f89a

arch/x86/include/asm/apb_timer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ extern int sfi_mtimer_num;
		#else /* CONFIG_APB_TIMER */

		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 /* ASM_X86_APBT_H */

drivers/watchdog/Kconfig

+1 −2

Original line number	Diff line number	Diff line
		@@ -535,8 +535,7 @@ config I6300ESB_WDT

		config INTEL_SCU_WATCHDOG
		bool "Intel SCU Watchdog for Mobile Platforms"
		depends on WATCHDOG
		depends on INTEL_SCU_IPC
		depends on X86_MRST
		---help---
		Hardware driver for the watchdog time built into the Intel SCU
		for Intel Mobile Platforms.

drivers/watchdog/intel_scu_watchdog.c

+0 −1

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

Admin message