Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / lasat / ds1603.c

diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c
index 7dced67c55ebe3959ba9d5efe8b4eaac9750eb05..52cb1436a12aff59908461f87f9ea114d44c1f63 100644 (file)
--- a/arch/mips/lasat/ds1603.c
+++ b/arch/mips/lasat/ds1603.c
@@ -18,7 +18,7 @@
 #define TRIMMER_VALUE_MASK 0x38
 #define TRIMMER_SHIFT 3
 
-struct ds_defs *ds1603 = NULL;
+struct ds_defs *ds1603;
 
 /* HW specific register functions */
 static void rtc_reg_write(unsigned long val)
@@ -91,7 +91,7 @@ static void rtc_write_byte(unsigned int byte)
 {
        int i;
 
-       for (i = 0; i<=7; i++) {
+       for (i = 0; i <= 7; i++) {
                rtc_write_databit(byte & 1L);
                byte >>= 1;
        }
@@ -101,7 +101,7 @@ static void rtc_write_word(unsigned long word)
 {
        int i;
 
-       for (i = 0; i<=31; i++) {
+       for (i = 0; i <= 31; i++) {
                rtc_write_databit(word & 1L);
                word >>= 1;
        }
@@ -113,7 +113,7 @@ static unsigned long rtc_read_word(void)
        unsigned long word = 0;
        unsigned long shift = 0;
 
-       for (i = 0; i<=31; i++) {
+       for (i = 0; i <= 31; i++) {
                word |= rtc_read_databit() << shift;
                shift++;
        }
@@ -135,8 +135,7 @@ static void rtc_end_op(void)
        lasat_ndelay(1000);
 }
 
-/* interface */
-unsigned long ds1603_read(void)
+unsigned long read_persistent_clock(void)
 {
        unsigned long word;
        unsigned long flags;
@@ -147,10 +146,11 @@ unsigned long ds1603_read(void)
        word = rtc_read_word();
        rtc_end_op();
        spin_unlock_irqrestore(&rtc_lock, flags);
+
        return word;
 }
 
-int ds1603_set(unsigned long time)
+int rtc_mips_set_mmss(unsigned long time)
 {
        unsigned long flags;