[MIPS] Deforest the function pointer jungle in the time code.

[firefly-linux-kernel-4.4.55.git] / arch / mips / sgi-ip32 / ip32-setup.c

diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index bbba066cb405c608de9a19020c276d21d1f87f1e..4125a5ba119e2fce144708c9b151e03f87d0ef75 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -62,10 +62,15 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 }
 #endif
 
+unsigned long read_persistent_clock(void)
+{
+       return mc146818_get_cmos_time();
+}
+
 /* An arbitrary time; this can be decreased if reliability looks good */
 #define WAIT_MS 10
 
-void __init ip32_time_init(void)
+void __init plat_time_init(void)
 {
        printk(KERN_INFO "Calibrating system timer... ");
        write_c0_count(0);
@@ -85,11 +90,6 @@ void __init plat_mem_setup(void)
 {
        board_be_init = ip32_be_init;
 
-       rtc_mips_get_time = mc146818_get_cmos_time;
-       rtc_mips_set_mmss = mc146818_set_rtc_mmss;
-
-       board_time_init = ip32_time_init;
-
 #ifdef CONFIG_SGI_O2MACE_ETH
        {
                char *mac = ArcGetEnvironmentVariable("eaddr");