Skip to contentSkip to conversation

rtc: remove broken rtc_read and rtc_write declarations

PATCH New Kim Phillips 3 participants 3 messages Mar 30, 2009 – Apr 1, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rtc: remove broken rtc_read and rtc_write declarations

commit 04e11cf3 "rtc: add support for 4543 RTC (manufactured by e.g. EPSON)" introduces the following build error on boards configuring e.g, the ds1374 rtc:

Configuring for MPC837XEMDS board...
ds1374.c:103: error: static declaration of 'rtc_read' follows non-static declaration /home/r1aaha/git/u-boot/include/rtc.h:64: error: previous declaration of 'rtc_read' was here ds1374.c:104: error: conflicting types for 'rtc_write' /home/r1aaha/git/u-boot/include/rtc.h:65: error: previous declaration of 'rtc_write' was here

this reverts the erroneous chunk.

CC Detlev Zundel <[email protected]>
CC Andreas Pfefferle <[email protected]>
---
 include/rtc.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
include/rtc.h +0 -4
index 019c2eb..785fbe3 100644
@@ -61,8 +61,4 @@ void to_tm (int, struct rtc_time *);
 unsigned long mktime (unsigned int, unsigned int, unsigned int,
 		      unsigned int, unsigned int, unsigned int);
 
-uchar rtc_read(uchar reg) __attribute__((weak));
-void  rtc_write(uchar reg, uchar val) __attribute__((weak));
-
-
 #endif	/* _RTC_H_ */
Signature · 1 line
1.6.1.3
#1 lore raw

PATCH 1/1 rtc: remove broken rtc_read and rtc_write declarations

Hi Kim,

Quoted 10 lines

commit 04e11cf3 "rtc: add support for 4543 RTC (manufactured by e.g. EPSON)" introduces the following build error on boards configuring e.g, the ds1374 rtc:

Configuring for MPC837XEMDS board...
ds1374.c:103: error: static declaration of 'rtc_read' follows non-static declaration /home/r1aaha/git/u-boot/include/rtc.h:64: error: previous declaration of 'rtc_read' was here ds1374.c:104: error: conflicting types for 'rtc_write' /home/r1aaha/git/u-boot/include/rtc.h:65: error: previous declaration of 'rtc_write' was here

Quoted 5 lines

this reverts the erroneous chunk.

CC Detlev Zundel <[email protected]>
CC Andreas Pfefferle <[email protected]>

Sorry for the breakage.

Cheers
Detlev

Signature · 8 lines
Math and Alcohol don't mix, so...
PLEASE DON'T DRINK AND DERIVE

[Motto of the society: Mathematicians Against Drunk Deriving]
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
#2 lore raw

PATCH 1/1 rtc: remove broken rtc_read and rtc_write declarations

In reply to Kim Phillips

Dear Kim Phillips,

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

commit 04e11cf3 "rtc: add support for 4543 RTC (manufactured by e.g. EPSON)" introduces the following build error on boards configuring e.g, the ds1374 rtc:

Configuring for MPC837XEMDS board...
ds1374.c:103: error: static declaration of 'rtc_read' follows non-static declaration /home/r1aaha/git/u-boot/include/rtc.h:64: error: previous declaration of 'rtc_read' was here ds1374.c:104: error: conflicting types for 'rtc_write' /home/r1aaha/git/u-boot/include/rtc.h:65: error: previous declaration of 'rtc_write' was here

Quoted 8 lines

this reverts the erroneous chunk.

CC Detlev Zundel <[email protected]>
CC Andreas Pfefferle <[email protected]>
---
 include/rtc.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 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
As usual, this being a 1.3.x release, I haven't  even  compiled  this
kernel yet. So if it works, you should be doubly impressed.
      - Linus Torvalds in <[email protected]>