lib: sbi: Remove sbi_console_init() and console_init() platform callback
Now that all platforms have been updated to initialize serial console
device in early_init(), the sbi_console_init() and console_init()
platform callback are redundant hence remove them.
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-By: Himanshu Chauhan <hchauhan@ventanamicro.com>
diff --git a/include/sbi/sbi_console.h b/include/sbi/sbi_console.h
index 0979765..3097db1 100644
--- a/include/sbi/sbi_console.h
+++ b/include/sbi/sbi_console.h
@@ -58,8 +58,6 @@
struct sbi_scratch;
-int sbi_console_init(struct sbi_scratch *scratch);
-
#define SBI_ASSERT(cond, args) do { \
if (unlikely(!(cond))) \
sbi_panic args; \
diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h
index 581935a..7b3ac4b 100644
--- a/include/sbi/sbi_platform.h
+++ b/include/sbi/sbi_platform.h
@@ -111,9 +111,6 @@
/** Get platform specific mhpmevent value */
uint64_t (*pmu_xlate_to_mhpmevent)(uint32_t event_idx, uint64_t data);
- /** Initialize the platform console */
- int (*console_init)(void);
-
/** Initialize the platform interrupt controller for current HART */
int (*irqchip_init)(bool cold_boot);
/** Exit the platform interrupt controller for current HART */
@@ -550,20 +547,6 @@
}
/**
- * Initialize the platform console
- *
- * @param plat pointer to struct sbi_platform
- *
- * @return 0 on success and negative error code on failure
- */
-static inline int sbi_platform_console_init(const struct sbi_platform *plat)
-{
- if (plat && sbi_platform_ops(plat)->console_init)
- return sbi_platform_ops(plat)->console_init();
- return 0;
-}
-
-/**
* Initialize the platform interrupt controller for current HART
*
* @param plat pointer to struct sbi_platform
diff --git a/lib/sbi/sbi_console.c b/lib/sbi/sbi_console.c
index d3ec461..194529d 100644
--- a/lib/sbi/sbi_console.c
+++ b/lib/sbi/sbi_console.c
@@ -477,14 +477,3 @@
console_dev = dev;
}
-
-int sbi_console_init(struct sbi_scratch *scratch)
-{
- int rc = sbi_platform_console_init(sbi_platform_ptr(scratch));
-
- /* console is not a necessary device */
- if (rc == SBI_ENODEV)
- return 0;
-
- return rc;
-}
diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c
index 0f9e14c..d80efe9 100644
--- a/lib/sbi/sbi_init.c
+++ b/lib/sbi/sbi_init.c
@@ -261,10 +261,6 @@
if (rc)
sbi_hart_hang();
- rc = sbi_console_init(scratch);
- if (rc)
- sbi_hart_hang();
-
rc = sbi_sse_init(scratch, true);
if (rc) {
sbi_printf("%s: sse init failed (error %d)\n", __func__, rc);
