leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common: board_r: Drop initr_xen wrapper

Browse Source 
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>
This commit is contained in:
Ovidiu Panait 2020-11-28 10:43:14 +02:00 committed by Tom Rini
parent 42d0d4223f
commit eb2825b79d
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/board_r.c
View File

@ -428,14 +428,6 @@ static int initr_mmc(void)
} }
#endif #endif
#ifdef CONFIG_XEN
static int initr_xen(void)
{
xen_init();
return 0;
}
#endif
#ifdef CONFIG_PVBLOCK #ifdef CONFIG_PVBLOCK
static int initr_pvblock(void) static int initr_pvblock(void)
{ {
@ -743,7 +735,7 @@ static init_fnc_t init_sequence_r[] = {
initr_mmc, initr_mmc,
#endif #endif
#ifdef CONFIG_XEN #ifdef CONFIG_XEN
initr_xen, xen_init,
#endif #endif
#ifdef CONFIG_PVBLOCK #ifdef CONFIG_PVBLOCK
initr_pvblock, initr_pvblock,

4
drivers/xen/hypervisor.c
View File

@ -232,7 +232,7 @@ void clear_evtchn(uint32_t port)
synch_clear_bit(port, &s->evtchn_pending[0]); synch_clear_bit(port, &s->evtchn_pending[0]);
} }
void xen_init(void) int xen_init(void)
{ {
debug("%s\n", __func__); debug("%s\n", __func__);
@ -240,6 +240,8 @@ void xen_init(void)
init_events(); init_events();
init_xenbus(); init_xenbus();
init_gnttab(); init_gnttab();
return 0;
} }
void xen_fini(void) void xen_fini(void)

2
include/xen.h
View File

@ -11,7 +11,7 @@
* Map Xen memory pages, initialize event handler and xenbus, * Map Xen memory pages, initialize event handler and xenbus,
* setup the grant table. * setup the grant table.
*/ */
void xen_init(void); int xen_init(void);
/** /**
* xen_fini() - Board cleanup before Linux kernel start * xen_fini() - Board cleanup before Linux kernel start