From bf0b6313433819899c49d8d6fb30b4d702226f1e Mon Sep 17 00:00:00 2001 From: Sven Schnelle Date: Tue, 4 Oct 2011 21:53:32 +0200 Subject: AVR32: fix timer_init() function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit timer_init() now returns an int (the error code) instead of void. This makes compilation fail with: interrupts.c:111: error: conflicting types for 'timer_init' /home/svens/u-boot/u-boot/include/common.h:246: error: previous declaration of 'timer_init' was here make[1]: *** [interrupts.o] Error 1 Signed-off-by: Sven Schnelle Acked-by: Andreas Bießmann Signed-off-by: Anatolij Gustschin --- arch/avr32/cpu/interrupts.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/avr32/cpu/interrupts.c') diff --git a/arch/avr32/cpu/interrupts.c b/arch/avr32/cpu/interrupts.c index 6681e13b939..49a00f1c8ca 100644 --- a/arch/avr32/cpu/interrupts.c +++ b/arch/avr32/cpu/interrupts.c @@ -107,7 +107,7 @@ static int set_interrupt_handler(unsigned int nr, void (*handler)(void), return 0; } -void timer_init(void) +int timer_init(void) { extern void timer_interrupt_handler(void); u64 tmp; @@ -120,8 +120,9 @@ void timer_init(void) tb_factor = (u32)tmp; if (set_interrupt_handler(0, &timer_interrupt_handler, 3)) - return; + return -EINVAL; /* For all practical purposes, this gives us an overflow interrupt */ sysreg_write(COMPARE, 0xffffffff); + return 0; } -- cgit v1.2.3