diff mbox

[v3,10/10] console: remove force_dummy_console()

Message ID 1482295952-30060-11-git-send-email-oohall@gmail.com
State Accepted
Headers show

Commit Message

Oliver O'Halloran Dec. 21, 2016, 4:52 a.m. UTC 
force_dummy_console() was only ever used to ensure the dummy console
would be initialised when the platform did not setup it's usual console.
The new console init path will uses the dummy console by default so this
is now unnecessary.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
 core/console.c          | 9 +--------
 include/console.h       | 2 --
 platforms/mambo/mambo.c | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)
diff mbox

Patch

diff --git a/core/console.c b/core/console.c
index 34605c4ed0b7..86d34470aa05 100644
--- a/core/console.c
+++ b/core/console.c
@@ -49,7 +49,7 @@  struct memcons memcons __section(".data.memcons") = {
 	.ibuf_size	= INMEM_CON_IN_LEN,
 };
 
-bool dummy_console_enabled(void)
+static bool dummy_console_enabled(void)
 {
 #ifdef FORCE_DUMMY_CONSOLE
 	return true;
@@ -59,13 +59,6 @@  bool dummy_console_enabled(void)
 #endif
 }
 
-void force_dummy_console(void)
-{
-	if (!dummy_console_enabled())
-		dt_add_property(dt_chosen, "sapphire,enable-dummy-console",
-						NULL, 0);
-}
-
 /*
  * Helper function for adding /ibm,opal/consoles/serial@<xyz> nodes
  */
diff --git a/include/console.h b/include/console.h
index f7cf999db748..b726251fc5f2 100644
--- a/include/console.h
+++ b/include/console.h
@@ -75,8 +75,6 @@  struct opal_con_ops {
 	int64_t (*flush)(int64_t term_number);
 };
 
-extern bool dummy_console_enabled(void);
-extern void force_dummy_console(void);
 extern bool flush_console(void);
 
 extern void set_console(struct con_ops *driver);
diff --git a/platforms/mambo/mambo.c b/platforms/mambo/mambo.c
index 807931392bf0..b627b7f017b6 100644
--- a/platforms/mambo/mambo.c
+++ b/platforms/mambo/mambo.c
@@ -213,7 +213,6 @@  static void mambo_rtc_init(void)
 
 static void mambo_platform_init(void)
 {
-	force_dummy_console();
 	mambo_rtc_init();
 	bogus_disk_flash_init();
 }