tools/proftool: remove REG_NOERROR

[karo-tx-uboot.git] / drivers / rtc / m48t35ax.c

diff --git a/drivers/rtc/m48t35ax.c b/drivers/rtc/m48t35ax.c
index 353a30e1f28138e36ecd350a1ff386f6510c039b..29b36c171c0dcbb17677f8c52640dfd7067c41b1 100644 (file)
--- a/drivers/rtc/m48t35ax.c
+++ b/drivers/rtc/m48t35ax.c
@@ -37,8 +37,6 @@
 
 static uchar rtc_read  (uchar reg);
 static void  rtc_write (uchar reg, uchar val);
-static uchar bin2bcd   (unsigned int n);
-static unsigned bcd2bin(uchar c);
 
 /* ------------------------------------------------------------------------- */
 
@@ -87,7 +85,7 @@ int rtc_get (struct rtc_time *tmp)
        return 0;
 }
 
-void rtc_set (struct rtc_time *tmp)
+int rtc_set (struct rtc_time *tmp)
 {
        uchar ccr;                      /* Clock control register */
        uchar century;
@@ -116,6 +114,8 @@ void rtc_set (struct rtc_time *tmp)
        ccr = rtc_read(0);
        ccr = ccr & 0x7F;
        rtc_write(0, ccr);
+
+       return 0;
 }
 
 void rtc_reset (void)
@@ -145,24 +145,14 @@ static uchar rtc_read (uchar reg)
 {
        uchar val;
        val = *(unsigned char *)
-               ((CFG_NVRAM_BASE_ADDR + CFG_NVRAM_SIZE - 8) + reg);
+               ((CONFIG_SYS_NVRAM_BASE_ADDR + CONFIG_SYS_NVRAM_SIZE - 8) + reg);
        return val;
 }
 
 static void rtc_write (uchar reg, uchar val)
 {
        *(unsigned char *)
-               ((CFG_NVRAM_BASE_ADDR + CFG_NVRAM_SIZE - 8) + reg) = val;
-}
-
-static unsigned bcd2bin (uchar n)
-{
-       return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
-}
-
-static unsigned char bin2bcd (unsigned int n)
-{
-       return (((n / 10) << 4) | (n % 10));
+               ((CONFIG_SYS_NVRAM_BASE_ADDR + CONFIG_SYS_NVRAM_SIZE - 8) + reg) = val;
 }
 
 #endif