Skip to contentSkip to conversation

AVR32: fix timer_init() function

PATCH Superseded Sven Schnelle 5 participants 8 messages Oct 4, 2011 – Feb 27, 2012

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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

---
Changes for v3:
- return -EINVAL regardless of the return value
Changes for v2:
- Coding style

 arch/avr32/cpu/interrupts.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
arch/avr32/cpu/interrupts.c +3 -2
index 6681e13..49a00f1 100644
@@ -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;
 }

--
1.7.5.4

#1 lore raw

PATCH v3 1/1 AVR32: fix timer_init() function

Dear Sven,

Am 04.10.2015 21:53, schrieb Sven Schnelle:

Quoted 8 lines

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

#2 lore raw

Hi Wolfgang,

Le 05/10/2011 09:12, Andreas Bie?mann a ?crit :

Quoted 3 lines

Dear Sven,

Am 04.10.2015 21:53, schrieb Sven Schnelle:

Apparently, something went quite wrong with the date for this patch. See
http://patchwork.ozlabs.org/patch/117688/, which places it in 2015 (like Andreas' answer does), ignoring Sven's patch mails dates.

Wolfgang, maybe this should be mentioned to the patchwork folks.

Amicalement,

Signature · 1 line
Albert.
#3 lore raw

Dear Albert,

Am 08.11.2011 10:38, schrieb Albert ARIBAUD:

Quoted 10 lines

Hi Wolfgang,

Le 05/10/2011 09:12, Andreas Bie?mann a ?crit :

Quoted 3 lines

Dear Sven,

Am 04.10.2015 21:53, schrieb Sven Schnelle:

Apparently, something went quite wrong with the date for this patch. See
http://patchwork.ozlabs.org/patch/117688/, which places it in 2015 (like Andreas' answer does), ignoring Sven's patch mails dates.

Sven's MUA has set the 'Date:' field to 'Date: Sun, 4 Oct 2015 21:53:32 +0200' in Mail header.

BTW this will also be the date of the patch in git and could lead to problems when merge/rebase in future. Sven, could you please provide another version of the patch _or_ Reinhard could you please adopt the mail header (Date:) before applying this patch?

Quoted 1 line

Wolfgang, maybe this should be mentioned to the patchwork folks.

I don't think patchwork was wrong here. My MUA acts the same way.

best regards

Andreas Bie?mann

#4 lore raw

PATCH v3 1/1 AVR32: fix timer_init() function

In reply to Sven Schnelle
Quoted 8 lines · On Sun, 4 Oct 2015 21:53:32 +0200 Sven Schnelle <[email protected]> wrote:

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

Quoted 8 lines

---
Changes for v3:
- return -EINVAL regardless of the return value
Changes for v2:
- Coding style

 arch/avr32/cpu/interrupts.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Applied to u-boot-staging/agust at denx.de after fixing the date to patch reception date from email header. Thanks.

Anatolij

#5 lore raw

PATCH v3 1/1 AVR32: fix timer_init() function

In reply to Sven Schnelle

Dear Sven Schnelle,

Quoted 8 lines · In message <[email protected]> you wrote:

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

Quoted 8 lines

---
Changes for v3:
- return -EINVAL regardless of the return value
Changes for v2:
- Coding style

 arch/avr32/cpu/interrupts.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Applied, thanks. [Cherry-picked Anatolij's commit.]

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The trouble with doing something right the first time is that nobody
appreciates how difficult it was."                        - Walt West
#6 lore raw

PATCH v3 1/1 AVR32: fix timer_init() function

In reply to Sven Schnelle

Dear Sven,

Quoted 1 line

Date: Sun, 4 Oct 2015 21:53:32 +0200

would you be willing to disclose the secrets of running such a time machine ?

Quoted 6 lines · In message <[email protected]> you wrote:

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

We're just discussing to drop support for AVR32 systems due to lack of a custodian, and appearent lack of interest, see
02/25 To:u-boot at lists.d [PATCH] AVR32 removal due to lack of custodian.
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/125752

Are you still interestedin AVR32? Would you be willing to volunteer to take over custodianship for this processor family?

Or Andreas, would you?

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A good aphorism is too hard for the tooth of time, and  is  not  worn
away  by  all  the  centuries,  although  it serves as food for every
epoch.                                  - Friedrich Wilhelm Nietzsche
                          _Miscellaneous Maxims and Opinions_ no. 168
#7 lore raw

PATCH v3 1/1 AVR32: fix timer_init() function

Hi Wolfgang,

Quoted 6 lines · Wolfgang Denk

Dear Sven,

Quoted 1 line

Date: Sun, 4 Oct 2015 21:53:32 +0200

would you be willing to disclose the secrets of running such a time machine ?

Hehe. The 'time machine' was basically a dead CMOS battery in my Thinkpad at that time ;)

Quoted 9 lines
Quoted 6 lines · In message<[email protected]> you wrote:

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

Quoted 7 lines

We're just discussing to drop support for AVR32 systems due to lack of a custodian, and appearent lack of interest, see
02/25 To:u-boot at lists.d [PATCH] AVR32 removal due to lack of custodian.
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/125752

Are you still interestedin AVR32? Would you be willing to volunteer to take over custodianship for this processor family?

I fear i don't have enough time for maintaining a port, and i only have one AVR32 Board (the ATGNW100). I think Andreas would be a much better maintainer, IMHO he has much more knowledge on the AVR32 area.

Regards,
Sven