common: board_r: Drop initr_jumptable wrapper

Add a return value to jumptable_init and use it directly in the
post-relocation init sequence, rather than using a wrapper stub.

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

diff --git a/common/board_r.c b/common/board_r.c
index a5cbbcc343f3d3e38f0ea56d3969804d3293d288..32ad40d372723149373a738bf1bfd0f3901953a2 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -490,12 +490,6 @@ static int initr_malloc_bootparams(void)
 }
 #endif
 
-static int initr_jumptable(void)
-{
-       jumptable_init();
-       return 0;
-}
-
 #if defined(CONFIG_API)
 static int initr_api(void)
 {
@@ -757,7 +751,7 @@ static init_fnc_t init_sequence_r[] = {
        pci_init,
 #endif
        stdio_add_devices,
-       initr_jumptable,
+       jumptable_init,
 #ifdef CONFIG_API
        initr_api,
 #endif

diff --git a/common/exports.c b/common/exports.c
index 6253b55694bfc638ece0a6590166e09bbac999d5..4578f07021f35a1e6fb28ea378e946a65a6db436 100644 (file)
--- a/common/exports.c
+++ b/common/exports.c
@@ -25,8 +25,10 @@ unsigned long get_version(void)
 # define miiphy_set_current_dev                dummy
 #endif
 
-void jumptable_init(void)
+int jumptable_init(void)
 {
        gd->jt = malloc(sizeof(struct jt_funcs));
 #include <_exports.h>
+
+       return 0;
 }

diff --git a/include/exports.h b/include/exports.h
index b30055409164534b7d59e0a0e5f139271d49d254..faf0f5924432adda7b3f42fd02dc537ea60ac50f 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -15,8 +15,14 @@
 struct cmd_tbl;
 struct spi_slave;
 
-/* Set up the jump table for use by the API */
-void jumptable_init(void);
+/**
+ * jumptable_init() - Set up the jump table for use by the API
+ *
+ * It is called during the generic post-relocation init sequence.
+ *
+ * Return: 0 if OK
+ */
+int jumptable_init(void);
 
 /* These are declarations of exported functions available in C code */
 unsigned long get_version(void);