diff options
| author | Sven Schnelle <svens@stackframe.org> | 2011-10-04 21:53:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-20 23:10:04 +0100 |
| commit | bf0b6313433819899c49d8d6fb30b4d702226f1e (patch) | |
| tree | 7a2dab8a6c3e11edb6ea78d48018d6a793eae2c1 | |
| parent | e570fe8ef2734fddc15e086b7bc344e64c907e81 (diff) | |
| download | u-boot-imx-bf0b6313433819899c49d8d6fb30b4d702226f1e.zip u-boot-imx-bf0b6313433819899c49d8d6fb30b4d702226f1e.tar.gz u-boot-imx-bf0b6313433819899c49d8d6fb30b4d702226f1e.tar.bz2 | |
AVR32: fix timer_init() function
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 <svens@stackframe.org>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
| -rw-r--r-- | arch/avr32/cpu/interrupts.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/avr32/cpu/interrupts.c b/arch/avr32/cpu/interrupts.c index 6681e13..49a00f1 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; } |