From 6121f15d515d565d83f9f0821daee8f14c611bb7 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sat, 15 Jan 2022 12:08:41 +0800
Subject: [PATCH] rtc/rpmsg: Move rtc_initialize out of rpmsg_rtc_initialize

like other rtc driver

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 boards/sim/sim/sim/src/sim_bringup.c | 14 ++++++++------
 drivers/timers/rpmsg_rtc.c           | 11 +++--------
 include/nuttx/timers/rpmsg_rtc.h     |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c
index 9d0e180ce5..d040673729 100644
--- a/boards/sim/sim/sim/src/sim_bringup.c
+++ b/boards/sim/sim/sim/src/sim_bringup.c
@@ -105,7 +105,9 @@ int sim_bringup(void)
 #ifdef CONFIG_SIM_SPI
   FAR struct spi_dev_s *spidev;
 #endif
-
+#if defined(CONFIG_RTC_RPMSG) && !defined(CONFIG_RTC_RPMSG_SERVER)
+  FAR struct rtc_lowerhalf_s *rtc;
+#endif
   int ret = OK;
 
 #ifdef CONFIG_FS_BINFS
@@ -446,16 +448,16 @@ int sim_bringup(void)
   syslog_rpmsg_server_init();
 #endif
 
-#ifndef CONFIG_RTC_RPMSG_SERVER
-  up_rtc_set_lowerhalf(rpmsg_rtc_initialize(0));
+#if defined(CONFIG_RTC_RPMSG) && !defined(CONFIG_RTC_RPMSG_SERVER)
+  rtc = rpmsg_rtc_initialize();
+  up_rtc_set_lowerhalf(rtc);
+  rtc_initialize(0, rtc);
 #endif
 
-#ifdef CONFIG_FS_RPMSGFS
-#ifdef CONFIG_SIM_RPTUN_MASTER
+#if defined(CONFIG_FS_RPMSGFS) && defined(CONFIG_SIM_RPTUN_MASTER)
   rpmsgfs_server_init();
 #endif
 #endif
-#endif
 
 #ifdef CONFIG_SIM_WTGAHRS2_UARTN
 #if CONFIG_SIM_WTGAHRS2_UARTN == 0
diff --git a/drivers/timers/rpmsg_rtc.c b/drivers/timers/rpmsg_rtc.c
index 78b68d5202..42134cd608 100644
--- a/drivers/timers/rpmsg_rtc.c
+++ b/drivers/timers/rpmsg_rtc.c
@@ -689,9 +689,6 @@ static void rpmsg_rtc_server_ns_bind(FAR struct rpmsg_device *rdev,
  *
  *   Take remote core RTC as external RTC hardware through rpmsg.
  *
- * Input Parameters:
- *   minor  - device minor number
- *
  * Returned Value:
  *   Return the lower half RTC driver instance on success;
  *   A NULL pointer on failure.
@@ -699,21 +696,19 @@ static void rpmsg_rtc_server_ns_bind(FAR struct rpmsg_device *rdev,
  ****************************************************************************/
 
 #ifndef CONFIG_RTC_RPMSG_SERVER
-FAR struct rtc_lowerhalf_s *rpmsg_rtc_initialize(int minor)
+FAR struct rtc_lowerhalf_s *rpmsg_rtc_initialize(void)
 {
   FAR struct rpmsg_rtc_lowerhalf_s *lower;
 
   lower = kmm_zalloc(sizeof(*lower));
-  if (lower)
+  if (lower != NULL)
     {
-      lower->ops     = &g_rpmsg_rtc_ops;
+      lower->ops = &g_rpmsg_rtc_ops;
 
       rpmsg_register_callback(lower,
                               rpmsg_rtc_device_created,
                               rpmsg_rtc_device_destroy,
                               NULL);
-
-      rtc_initialize(minor, (FAR struct rtc_lowerhalf_s *)lower);
     }
 
   return (FAR struct rtc_lowerhalf_s *)lower;
diff --git a/include/nuttx/timers/rpmsg_rtc.h b/include/nuttx/timers/rpmsg_rtc.h
index 813cd04912..6d412d1ce2 100644
--- a/include/nuttx/timers/rpmsg_rtc.h
+++ b/include/nuttx/timers/rpmsg_rtc.h
@@ -42,7 +42,7 @@ extern "C"
 
 #ifdef CONFIG_RTC_RPMSG
 #ifndef CONFIG_RTC_RPMSG_SERVER
-FAR struct rtc_lowerhalf_s *rpmsg_rtc_initialize(int minor);
+FAR struct rtc_lowerhalf_s *rpmsg_rtc_initialize(void);
 #else
 FAR struct rtc_lowerhalf_s *rpmsg_rtc_server_initialize(
                                          FAR struct rtc_lowerhalf_s *lower);