[PATCH] mips: fixed collision of rtc function name

Fix the collision of rtc function name.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/mips/ddb5xxx/common/rtc_ds1386.c b/arch/mips/ddb5xxx/common/rtc_ds1386.c
index 995896ac0e39012f9b707860a429c79244908fce..5dc34daa71505058fb2de065e4352f441f436176 100644 (file)
--- a/arch/mips/ddb5xxx/common/rtc_ds1386.c
+++ b/arch/mips/ddb5xxx/common/rtc_ds1386.c
@@ -165,6 +165,6 @@ rtc_ds1386_init(unsigned long base)
        WRITE_RTC(0xB, byte);
 
        /* set the function pointers */
-       rtc_get_time = rtc_ds1386_get_time;
-       rtc_set_time = rtc_ds1386_set_time;
+       rtc_mips_get_time = rtc_ds1386_get_time;
+       rtc_mips_set_time = rtc_ds1386_set_time;
 }

diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index 174822344131cf86946add567a6d08b4f8469533..f17d3378e9a6796aaf76df4415c13bc58a9ce0d7 100644 (file)
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -193,8 +193,8 @@ static void dec_ioasic_hpt_init(unsigned int count)
 
 void __init dec_time_init(void)
 {
-       rtc_get_time = dec_rtc_get_time;
-       rtc_set_mmss = dec_rtc_set_mmss;
+       rtc_mips_get_time = dec_rtc_get_time;
+       rtc_mips_set_mmss = dec_rtc_set_mmss;
 
        mips_timer_state = dec_timer_state;
        mips_timer_ack = dec_timer_ack;

diff --git a/arch/mips/ite-boards/generic/time.c b/arch/mips/ite-boards/generic/time.c
index f5d67ee21ac632f1e8c6a14a9d612f7de6273080..b79817bb6cceb777e79ce8f5a315e1811c6a20e5 100644 (file)
--- a/arch/mips/ite-boards/generic/time.c
+++ b/arch/mips/ite-boards/generic/time.c
@@ -227,8 +227,8 @@ void __init it8172_time_init(void)
 
        local_irq_restore(flags);
 
-       rtc_get_time = it8172_rtc_get_time;
-       rtc_set_time = it8172_rtc_set_time;
+       rtc_mips_get_time = it8172_rtc_get_time;
+       rtc_mips_set_time = it8172_rtc_set_time;
 }
 
 #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)

diff --git a/arch/mips/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c
index 9a8bff153d80020d0fb8c6b3734e09e89709cb10..a6bd3f4d3049d56c9790a1ffb450edeb29062d16 100644 (file)
--- a/arch/mips/jmr3927/common/rtc_ds1742.c
+++ b/arch/mips/jmr3927/common/rtc_ds1742.c
@@ -159,8 +159,8 @@ rtc_ds1742_init(unsigned long base)
        db_assert((rtc_base & 0xe0000000) == KSEG1);
 
        /* set the function pointers */
-       rtc_get_time = rtc_ds1742_get_time;
-       rtc_set_time = rtc_ds1742_set_time;
+       rtc_mips_get_time = rtc_ds1742_get_time;
+       rtc_mips_set_time = rtc_ds1742_set_time;
 
        /* clear oscillator stop bit */
        CMOS_WRITE(RTC_READ, RTC_CONTROL);

diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 51273b7297a76223f0a0b4035d3af21e1534e83b..5e51a2d8f3f0712072e59a2a53f01a46b9880453 100644 (file)
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -65,9 +65,9 @@ static int null_rtc_set_time(unsigned long sec)
        return 0;
 }
 
-unsigned long (*rtc_get_time)(void) = null_rtc_get_time;
-int (*rtc_set_time)(unsigned long) = null_rtc_set_time;
-int (*rtc_set_mmss)(unsigned long);
+unsigned long (*rtc_mips_get_time)(void) = null_rtc_get_time;
+int (*rtc_mips_set_time)(unsigned long) = null_rtc_set_time;
+int (*rtc_mips_set_mmss)(unsigned long);
 
 
 /* usecs per counter cycle, shifted to left by 32 bits */
@@ -440,14 +440,14 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
        /*
         * If we have an externally synchronized Linux clock, then update
-        * CMOS clock accordingly every ~11 minutes. rtc_set_time() has to be
+        * CMOS clock accordingly every ~11 minutes. rtc_mips_set_time() has to be
         * called as close as possible to 500 ms before the new second starts.
         */
        if (ntp_synced() &&
            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_mmss(xtime.tv_sec) == 0) {
+               if (rtc_mips_set_mmss(xtime.tv_sec) == 0) {
                        last_rtc_update = xtime.tv_sec;
                } else {
                        /* do it again in 60 s */
@@ -565,7 +565,7 @@ asmlinkage void ll_local_timer_interrupt(int irq, struct pt_regs *regs)
  *      b) (optional) calibrate and set the mips_hpt_frequency
  *         (only needed if you intended to use fixed_rate_gettimeoffset
  *          or use cpu counter as timer interrupt source)
- * 2) setup xtime based on rtc_get_time().
+ * 2) setup xtime based on rtc_mips_get_time().
  * 3) choose a appropriate gettimeoffset routine.
  * 4) calculate a couple of cached variables for later usage
  * 5) board_timer_setup() -
@@ -633,10 +633,10 @@ void __init time_init(void)
        if (board_time_init)
                board_time_init();
 
-       if (!rtc_set_mmss)
-               rtc_set_mmss = rtc_set_time;
+       if (!rtc_mips_set_mmss)
+               rtc_mips_set_mmss = rtc_mips_set_time;
 
-       xtime.tv_sec = rtc_get_time();
+       xtime.tv_sec = rtc_mips_get_time();
        xtime.tv_nsec = 0;
 
        set_normalized_timespec(&wall_to_monotonic,
@@ -772,8 +772,8 @@ void to_tm(unsigned long tim, struct rtc_time *tm)
 
 EXPORT_SYMBOL(rtc_lock);
 EXPORT_SYMBOL(to_tm);
-EXPORT_SYMBOL(rtc_set_time);
-EXPORT_SYMBOL(rtc_get_time);
+EXPORT_SYMBOL(rtc_mips_set_time);
+EXPORT_SYMBOL(rtc_mips_get_time);
 
 unsigned long long sched_clock(void)
 {

diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index e9e9a89c674182baad26750f7fa5094d4950b5d2..bb70a8240e610026dae01c69d4c3b195b9ac4833 100644 (file)
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -175,8 +175,8 @@ void __init plat_setup(void)
 
 #ifdef CONFIG_DS1603
        ds1603 = &ds_defs[mips_machtype];
-       rtc_get_time = ds1603_read;
-       rtc_set_time = ds1603_set;
+       rtc_mips_get_time = ds1603_read;
+       rtc_mips_set_time = ds1603_set;
 #endif
 
 #ifdef DYNAMIC_SERIAL_INIT

diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
index 873cf3141a31961002fef869527c4ed98bbac000..c20d401ecf80d5ed29e320ec0bd5e4e2c002a6d1 100644 (file)
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -65,7 +65,7 @@ void __init plat_setup(void)
 
        board_time_init = mips_time_init;
        board_timer_setup = mips_timer_setup;
-       rtc_get_time = mips_rtc_get_time;
+       rtc_mips_get_time = mips_rtc_get_time;
 }
 
 static void __init serial_init(void)

diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 2209e8a9de340e1125a538b5d73fee4ef0ec4224..b8488aab6df1cd17bfd4c2e902e4ba69daf4f2fe 100644 (file)
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -225,5 +225,5 @@ void __init plat_setup(void)
 
        board_time_init = mips_time_init;
        board_timer_setup = mips_timer_setup;
-       rtc_get_time = mips_rtc_get_time;
+       rtc_mips_get_time = mips_rtc_get_time;
 }

diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c
index 3784c898db1a00850ab1116986251df24b571230..91d9637143d7fe24690e063f16be9f887d4e909c 100644 (file)
--- a/arch/mips/momentum/jaguar_atx/setup.c
+++ b/arch/mips/momentum/jaguar_atx/setup.c
@@ -229,8 +229,8 @@ void momenco_time_init(void)
        mips_hpt_frequency = cpu_clock / 2;
        board_timer_setup = momenco_timer_setup;
 
-       rtc_get_time = m48t37y_get_time;
-       rtc_set_time = m48t37y_set_time;
+       rtc_mips_get_time = m48t37y_get_time;
+       rtc_mips_set_time = m48t37y_set_time;
 }
 
 static struct resource mv_pci_io_mem0_resource = {

diff --git a/arch/mips/momentum/ocelot_3/setup.c b/arch/mips/momentum/ocelot_3/setup.c
index f95677f4f06f7e0c1be3e7c3849ada251257836d..969612eab8a621b7a7fe46441f6607cdbdb10fd0 100644 (file)
--- a/arch/mips/momentum/ocelot_3/setup.c
+++ b/arch/mips/momentum/ocelot_3/setup.c
@@ -215,8 +215,8 @@ void momenco_time_init(void)
        mips_hpt_frequency = cpu_clock / 2;
        board_timer_setup = momenco_timer_setup;
 
-       rtc_get_time = m48t37y_get_time;
-       rtc_set_time = m48t37y_set_time;
+       rtc_mips_get_time = m48t37y_get_time;
+       rtc_mips_set_time = m48t37y_set_time;
 }
 
 /*

diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c
index bd02e60d037a94ad0768d33077751168d2a593ff..a3e6f5575592a2e63cc3c4991d4e24b8b2776739 100644 (file)
--- a/arch/mips/momentum/ocelot_c/setup.c
+++ b/arch/mips/momentum/ocelot_c/setup.c
@@ -227,8 +227,8 @@ void momenco_time_init(void)
        printk("momenco_time_init cpu_clock=%d\n", cpu_clock);
        board_timer_setup = momenco_timer_setup;
 
-       rtc_get_time = m48t37y_get_time;
-       rtc_set_time = m48t37y_set_time;
+       rtc_mips_get_time = m48t37y_get_time;
+       rtc_mips_set_time = m48t37y_set_time;
 }
 
 void __init plat_setup(void)

diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c
index 8bce711575decce5d40bd5c68909cf28b8a7fa98..3f724d661bdbf6d0f79aa56c7bc3b2793669cf23 100644 (file)
--- a/arch/mips/pmc-sierra/yosemite/setup.c
+++ b/arch/mips/pmc-sierra/yosemite/setup.c
@@ -198,8 +198,8 @@ static void __init py_rtc_setup(void)
        if (!m48t37_base)
                printk(KERN_ERR "Mapping the RTC failed\n");
 
-       rtc_get_time = m48t37y_get_time;
-       rtc_set_time = m48t37y_set_time;
+       rtc_mips_get_time = m48t37y_get_time;
+       rtc_mips_set_time = m48t37y_set_time;
 
        write_seqlock(&xtime_lock);
        xtime.tv_sec = m48t37y_get_time();

diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index b7300cc5c5ad0769e9062495f25cc4b4c97dd560..cca688ad64adaafc68d7e0a91aa1a1904f581d76 100644 (file)
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -212,8 +212,8 @@ static void indy_timer_setup(struct irqaction *irq)
 void __init ip22_time_init(void)
 {
        /* setup hookup functions */
-       rtc_get_time = indy_rtc_get_time;
-       rtc_set_time = indy_rtc_set_time;
+       rtc_mips_get_time = indy_rtc_get_time;
+       rtc_mips_set_time = indy_rtc_set_time;
 
        board_time_init = indy_time_init;
        board_timer_setup = indy_timer_setup;

diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index 2f50c79b7887f0044d2a232e19ef67ba20982b73..a2dd8ae1ea8f10f2f7bf5d7c77055b277b3120bd 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -91,8 +91,8 @@ void __init plat_setup(void)
 {
        board_be_init = ip32_be_init;
 
-       rtc_get_time = mc146818_get_cmos_time;
-       rtc_set_mmss = mc146818_set_rtc_mmss;
+       rtc_mips_get_time = mc146818_get_cmos_time;
+       rtc_mips_set_mmss = mc146818_set_rtc_mmss;
 
        board_time_init = ip32_time_init;
        board_timer_setup = ip32_timer_setup;

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index b661d2425a369bae38caa0b60141449c9f9c6655..4b5f74ff3edd3fd14aa861f0f507e911fc08d1b7 100644 (file)
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -121,14 +121,14 @@ void __init plat_setup(void)
 
        if (xicor_probe()) {
                printk("swarm setup: Xicor 1241 RTC detected.\n");
-               rtc_get_time = xicor_get_time;
-               rtc_set_time = xicor_set_time;
+               rtc_mips_get_time = xicor_get_time;
+               rtc_mips_set_time = xicor_set_time;
        }
 
        if (m41t81_probe()) {
                printk("swarm setup: M41T81 RTC detected.\n");
-               rtc_get_time = m41t81_get_time;
-               rtc_set_time = m41t81_set_time;
+               rtc_mips_get_time = m41t81_get_time;
+               rtc_mips_set_time = m41t81_set_time;
        }
 
        printk("This kernel optimized for "

diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 1141fcd13a59f266d067a624d328b7eab9c76535..01ba6c581e3d0ae7d5fae29041cb1c8bd70a794e 100644 (file)
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -164,8 +164,8 @@ static struct pci_controller sni_controller = {
 
 static inline void sni_pcimt_time_init(void)
 {
-       rtc_get_time = mc146818_get_cmos_time;
-       rtc_set_time = mc146818_set_rtc_mmss;
+       rtc_mips_get_time = mc146818_get_cmos_time;
+       rtc_mips_set_time = mc146818_set_rtc_mmss;
 }
 
 void __init plat_setup(void)

diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index 2ad6401d2af465d8d1b1aeebaedc2088fd41fe2d..6dcf077f61a0af526d625d6b683cec7e1502aeae 100644 (file)
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -1036,8 +1036,8 @@ toshiba_rbtx4927_time_init(void)
 
 #ifdef CONFIG_RTC_DS1742
 
-       rtc_get_time = rtc_ds1742_get_time;
-       rtc_set_time = rtc_ds1742_set_time;
+       rtc_mips_get_time = rtc_ds1742_get_time;
+       rtc_mips_set_time = rtc_ds1742_set_time;
 
        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
                                       ":rtc_ds1742_init()-\n");

diff --git a/arch/mips/tx4938/common/rtc_rx5c348.c b/arch/mips/tx4938/common/rtc_rx5c348.c
index d249edbb6af46dc4b93f4933f944afe41b3024b2..f74295f2852732d457eb1442280a2d249204af04 100644 (file)
--- a/arch/mips/tx4938/common/rtc_rx5c348.c
+++ b/arch/mips/tx4938/common/rtc_rx5c348.c
@@ -197,6 +197,6 @@ rtc_rx5c348_init(int chipid)
                srtc_24h = 1;
 
        /* set the function pointers */
-       rtc_get_time = rtc_rx5c348_get_time;
-       rtc_set_time = rtc_rx5c348_set_time;
+       rtc_mips_get_time = rtc_rx5c348_get_time;
+       rtc_mips_set_time = rtc_rx5c348_set_time;
 }

diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h
index 9cc3564cc2c9a0842b85bddf8f3f5d2eaf20c0b9..d897c8bb554d8e1792a4ed3a3588fdc92069517a 100644 (file)
--- a/include/asm-mips/time.h
+++ b/include/asm-mips/time.h
@@ -26,14 +26,14 @@ extern spinlock_t rtc_lock;
 
 /*
  * RTC ops.  By default, they point to no-RTC functions.
- *     rtc_get_time - mktime(year, mon, day, hour, min, sec) in seconds.
- *     rtc_set_time - reverse the above translation and set time to RTC.
- *     rtc_set_mmss - similar to rtc_set_time, but only min and sec need
+ *     rtc_mips_get_time - mktime(year, mon, day, hour, min, sec) in seconds.
+ *     rtc_mips_set_time - reverse the above translation and set time to RTC.
+ *     rtc_mips_set_mmss - similar to rtc_set_time, but only min and sec need
  *                     to be set.  Used by RTC sync-up.
  */
-extern unsigned long (*rtc_get_time)(void);
-extern int (*rtc_set_time)(unsigned long);
-extern int (*rtc_set_mmss)(unsigned long);
+extern unsigned long (*rtc_mips_get_time)(void);
+extern int (*rtc_mips_set_time)(unsigned long);
+extern int (*rtc_mips_set_mmss)(unsigned long);
 
 /*
  * Timer interrupt functions.