common: board_r: Drop initr_xen wrapper

Add a return value to xen_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 48e898b586145306f7b03a91adbded8cc06dfb6c..a5cbbcc343f3d3e38f0ea56d3969804d3293d288 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -428,14 +428,6 @@ static int initr_mmc(void)
 }
 #endif
 
-#ifdef CONFIG_XEN
-static int initr_xen(void)
-{
-       xen_init();
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_PVBLOCK
 static int initr_pvblock(void)
 {
@@ -743,7 +735,7 @@ static init_fnc_t init_sequence_r[] = {
        initr_mmc,
 #endif
 #ifdef CONFIG_XEN
-       initr_xen,
+       xen_init,
 #endif
 #ifdef CONFIG_PVBLOCK
        initr_pvblock,

diff --git a/drivers/xen/hypervisor.c b/drivers/xen/hypervisor.c
index 178c206f5bf40a4420f212216e05ebec770de170..25608948323e6f8304b488c94b82822d64d18399 100644 (file)
--- a/drivers/xen/hypervisor.c
+++ b/drivers/xen/hypervisor.c
@@ -232,7 +232,7 @@ void clear_evtchn(uint32_t port)
        synch_clear_bit(port, &s->evtchn_pending[0]);
 }
 
-void xen_init(void)
+int xen_init(void)
 {
        debug("%s\n", __func__);
 
@@ -240,6 +240,8 @@ void xen_init(void)
        init_events();
        init_xenbus();
        init_gnttab();
+
+       return 0;
 }
 
 void xen_fini(void)

diff --git a/include/xen.h b/include/xen.h
index a952a2c84b8b586ecb35c468e842f58bc6c62619..868132156e9bbcae543dc159ace0baa5e9303654 100644 (file)
--- a/include/xen.h
+++ b/include/xen.h
@@ -11,7 +11,7 @@
  * Map Xen memory pages, initialize event handler and xenbus,
  * setup the grant table.
  */
-void xen_init(void);
+int xen_init(void);
 
 /**
  * xen_fini() - Board cleanup before Linux kernel start