sh: Rename rtc_get/set_time() to avoid RTC_CLASS conflict.

We have a clash with RTC_CLASS over these names, so we
change them..

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/dreamcast/rtc.c b/arch/sh/boards/dreamcast/rtc.c
index 44420494dc2203fff134f171fdebf3cafbb7e46e..b3a876a3b85978363e7b9de6ccf5a464a026b55c 100644 (file)
--- a/arch/sh/boards/dreamcast/rtc.c
+++ b/arch/sh/boards/dreamcast/rtc.c
@@ -75,7 +75,7 @@ int aica_rtc_settimeofday(const time_t secs)
 
 void aica_time_init(void)
 {
-       rtc_get_time = aica_rtc_gettimeofday;
-       rtc_set_time = aica_rtc_settimeofday;
+       rtc_sh_get_time = aica_rtc_gettimeofday;
+       rtc_sh_set_time = aica_rtc_settimeofday;
 }
 

diff --git a/arch/sh/boards/landisk/rtc.c b/arch/sh/boards/landisk/rtc.c
index d666aa63303f4077fa4a4ab1195548dd42fdce0c..35ba726a097962718206fa62c53134c0fb035715 100644 (file)
--- a/arch/sh/boards/landisk/rtc.c
+++ b/arch/sh/boards/landisk/rtc.c
@@ -16,17 +16,9 @@
 #include <linux/time.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
+#include <linux/bcd.h>
+#include <asm/rtc.h>
 
-#ifndef BCD_TO_BIN
-#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
-#endif
-
-#ifndef BIN_TO_BCD
-#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
-#endif
-
-extern void (*rtc_get_time) (struct timespec *);
-extern int (*rtc_set_time) (const time_t);
 extern spinlock_t rtc_lock;
 
 extern void
@@ -94,9 +86,8 @@ int landisk_rtc_settimeofday(const time_t secs)
        return retval;
 }
 
-
 void landisk_time_init(void)
 {
-       rtc_get_time = landisk_rtc_gettimeofday;
-       rtc_set_time = landisk_rtc_settimeofday;
+       rtc_sh_get_time = landisk_rtc_gettimeofday;
+       rtc_sh_set_time = landisk_rtc_settimeofday;
 }

diff --git a/arch/sh/boards/mpc1211/rtc.c b/arch/sh/boards/mpc1211/rtc.c
index a76c655dceeeba4790a2654b03e525f824bf24ee..03b123a4bba42d54bd2757dc514da30fe1f7a998 100644 (file)
--- a/arch/sh/boards/mpc1211/rtc.c
+++ b/arch/sh/boards/mpc1211/rtc.c
@@ -130,7 +130,7 @@ int mpc1211_rtc_settimeofday(const struct timeval *tv)
 
 void mpc1211_time_init(void)
 {
-       rtc_get_time = mpc1211_rtc_gettimeofday;
-       rtc_set_time = mpc1211_rtc_settimeofday;
+       rtc_sh_get_time = mpc1211_rtc_gettimeofday;
+       rtc_sh_set_time = mpc1211_rtc_settimeofday;
 }
 

diff --git a/arch/sh/boards/sh03/rtc.c b/arch/sh/boards/sh03/rtc.c
index d609863cfe53fba5ba3068da2d1d78a95d2bade5..0a9266bb51c58bcd7309dcf15b5870b563a08f11 100644 (file)
--- a/arch/sh/boards/sh03/rtc.c
+++ b/arch/sh/boards/sh03/rtc.c
@@ -10,9 +10,10 @@
 #include <linux/sched.h>
 #include <linux/time.h>
 #include <linux/bcd.h>
-#include <asm/io.h>
 #include <linux/rtc.h>
 #include <linux/spinlock.h>
+#include <asm/io.h>
+#include <asm/rtc.h>
 
 #define RTC_BASE       0xb0000000
 #define RTC_SEC1       (RTC_BASE + 0)
@@ -34,8 +35,6 @@
 #define RTC_BUSY       1
 #define RTC_STOP       2
 
-extern void (*rtc_get_time)(struct timespec *);
-extern int (*rtc_set_time)(const time_t);
 extern spinlock_t rtc_lock;
 
 unsigned long get_cmos_time(void)
@@ -128,6 +127,6 @@ int sh03_rtc_settimeofday(const time_t secs)
 
 void sh03_time_init(void)
 {
-       rtc_get_time = sh03_rtc_gettimeofday;
-       rtc_set_time = sh03_rtc_settimeofday;
+       rtc_sh_get_time = sh03_rtc_gettimeofday;
+       rtc_sh_set_time = sh03_rtc_settimeofday;
 }

diff --git a/arch/sh/boards/snapgear/rtc.c b/arch/sh/boards/snapgear/rtc.c
index 287bc4ed3ac7c57bbf409c1f88397851c297caa2..722479deb55a8376f71aa23e3d933500d457f042 100644 (file)
--- a/arch/sh/boards/snapgear/rtc.c
+++ b/arch/sh/boards/snapgear/rtc.c
@@ -165,11 +165,11 @@ void __init secureedge5410_rtc_init(void)
                }
 
        if (use_ds1302) {
-               rtc_get_time = snapgear_rtc_gettimeofday;
-               rtc_set_time = snapgear_rtc_settimeofday;
+               rtc_sh_get_time = snapgear_rtc_gettimeofday;
+               rtc_sh_set_time = snapgear_rtc_settimeofday;
        } else {
-               rtc_get_time = sh_rtc_gettimeofday;
-               rtc_set_time = sh_rtc_settimeofday;
+               rtc_sh_get_time = sh_rtc_gettimeofday;
+               rtc_sh_set_time = sh_rtc_settimeofday;
        }
                
        printk("SnapGear RTC: using %s rtc.\n", use_ds1302 ? "ds1302" : "internal");

diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index c8db6ca4f9d14632f87f33f2a14eeb305fc86270..8acd70bffe76f1e57e132a9763e54f2d216b74fb 100644 (file)
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -29,11 +29,11 @@ EXPORT_SYMBOL(rtc_lock);
 /* XXX: Can we initialize this in a routine somewhere?  Dreamcast doesn't want
  * these routines anywhere... */
 #ifdef CONFIG_SH_RTC
-void (*rtc_get_time)(struct timespec *) = sh_rtc_gettimeofday;
-int (*rtc_set_time)(const time_t) = sh_rtc_settimeofday;
+void (*rtc_sh_get_time)(struct timespec *) = sh_rtc_gettimeofday;
+int (*rtc_sh_set_time)(const time_t) = sh_rtc_settimeofday;
 #else
-void (*rtc_get_time)(struct timespec *);
-int (*rtc_set_time)(const time_t);
+void (*rtc_sh_get_time)(struct timespec *);
+int (*rtc_sh_set_time)(const time_t);
 #endif
 
 /*
@@ -135,7 +135,7 @@ void handle_timer_tick(struct pt_regs *regs)
            xtime.tv_sec > last_rtc_update + 660 &&
            (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
            (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
-               if (rtc_set_time(xtime.tv_sec) == 0)
+               if (rtc_sh_set_time(xtime.tv_sec) == 0)
                        last_rtc_update = xtime.tv_sec;
                else
                        /* do it again in 60s */
@@ -193,8 +193,8 @@ void __init time_init(void)
 
        clk_init();
 
-       if (rtc_get_time) {
-               rtc_get_time(&xtime);
+       if (rtc_sh_get_time) {
+               rtc_sh_get_time(&xtime);
        } else {
                xtime.tv_sec = mktime(2000, 1, 1, 0, 0, 0);
                xtime.tv_nsec = 0;

diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index ea4bdf8cdf0d6b1b4caefe6a01db8e7b0934394d..205816fcf0da50d7fecdeecd5975c2fbaf6c0a9e 100644 (file)
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -132,17 +132,17 @@ static unsigned long tmu_timer_get_frequency(void)
        ctrl_outl(0xffffffff, TMU0_TCOR);
        ctrl_outl(0xffffffff, TMU0_TCNT);
 
-       rtc_get_time(&ts2);
+       rtc_sh_get_time(&ts2);
 
        do {
-               rtc_get_time(&ts1);
+               rtc_sh_get_time(&ts1);
        } while (ts1.tv_nsec == ts2.tv_nsec && ts1.tv_sec == ts2.tv_sec);
 
        /* actually start the timer */
        ctrl_outb(TMU_TSTR_INIT, TMU_TSTR);
 
        do {
-               rtc_get_time(&ts2);
+               rtc_sh_get_time(&ts2);
        } while (ts1.tv_nsec == ts2.tv_nsec && ts1.tv_sec == ts2.tv_sec);
 
        freq = 0xffffffff - ctrl_inl(TMU0_TCNT);

diff --git a/include/asm-sh/rtc.h b/include/asm-sh/rtc.h
index cea9cdf9b9252d7037c940594bfac4f0ab60caeb..4c7be859c9c0fc7368e49412cf13992d883a7349 100644 (file)
--- a/include/asm-sh/rtc.h
+++ b/include/asm-sh/rtc.h
@@ -8,8 +8,8 @@
 extern void sh_rtc_gettimeofday(struct timespec *ts);
 extern int sh_rtc_settimeofday(const time_t secs);
 extern void (*board_time_init)(void);
-extern void (*rtc_get_time)(struct timespec *);
-extern int (*rtc_set_time)(const time_t);
+extern void (*rtc_sh_get_time)(struct timespec *);
+extern int (*rtc_sh_set_time)(const time_t);
 
 /* RCR1 Bits */
 #define RCR1_CF                0x80    /* Carry Flag             */