diff mbox series

[v4,06/18] common: board_r: Drop initr_console_record wrapper

Message ID 20201128084320.10164-7-ovidiu.panait@windriver.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Minor board_f/board_r cleanups | expand

Commit Message

Ovidiu Panait Nov. 28, 2020, 8:43 a.m. UTC 
Drop initr_console_record wrapper and call console_record_init directly.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
v4 updates:
- none

v3 updates:
- none

v2 updates:
- add reviewed-by tag

 common/board_r.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Comments

Tom Rini Jan. 16, 2021, 4:22 p.m. UTC | #1 
On Sat, Nov 28, 2020 at 10:43:08AM +0200, Ovidiu Panait wrote:

> Drop initr_console_record wrapper and call console_record_init directly.
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/common/board_r.c b/common/board_r.c
index 29dd7d26d9..07c0ad363e 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -282,15 +282,6 @@  static int initr_malloc(void)
 	return 0;
 }
 
-static int initr_console_record(void)
-{
-#if defined(CONFIG_CONSOLE_RECORD)
-	return console_record_init();
-#else
-	return 0;
-#endif
-}
-
 #ifdef CONFIG_SYS_NONCACHED_MEMORY
 static int initr_noncached(void)
 {
@@ -713,7 +704,9 @@  static init_fnc_t init_sequence_r[] = {
 	initr_malloc,
 	log_init,
 	initr_bootstage,	/* Needs malloc() but has its own timer */
-	initr_console_record,
+#if defined(CONFIG_CONSOLE_RECORD)
+	console_record_init,
+#endif
 #ifdef CONFIG_SYS_NONCACHED_MEMORY
 	initr_noncached,
 #endif