common: board_r: Drop initr_pci_ep wrapper

Add a return value to pci_ep_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 7a06627ba9af3355b836e793b3f7a4922010e9d1..d86ff0cb5e9f412675f51d4ea0ed80e972878e7b 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -214,15 +214,6 @@ static int initr_unlock_ram_in_cache(void)
 }
 #endif
 
-#ifdef CONFIG_PCI_ENDPOINT
-static int initr_pci_ep(void)
-{
-       pci_ep_init();
-
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_PCI
 static int initr_pci(void)
 {
@@ -836,7 +827,7 @@ static init_fnc_t init_sequence_r[] = {
        initr_bbmii,
 #endif
 #ifdef CONFIG_PCI_ENDPOINT
-       initr_pci_ep,
+       pci_ep_init,
 #endif
 #ifdef CONFIG_CMD_NET
        INIT_FUNC_WATCHDOG_RESET

diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index 38a5f0837690335f5510da0b6fc721d0cd16c3e9..aa89701de8fba7e969cfcddd3403a3f7ccb39cff 100644 (file)
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -210,7 +210,7 @@ UCLASS_DRIVER(pci_ep) = {
        .flags          = DM_UC_FLAG_SEQ_ALIAS,
 };
 
-void pci_ep_init(void)
+int pci_ep_init(void)
 {
        struct udevice *dev;
 
@@ -219,4 +219,6 @@ void pci_ep_init(void)
             uclass_next_device_check(&dev)) {
                ;
        }
+
+       return 0;
 }

diff --git a/include/init.h b/include/init.h
index 7cdc47cff1b3d0dd5424bcd1b8bc4900f3b1e060..c6c5f34b55aa6c10a77c9e0da2f434fc9412c7f6 100644 (file)
--- a/include/init.h
+++ b/include/init.h
@@ -177,6 +177,15 @@ int setup_bdinfo(void);
  */
 int cpu_secondary_init_r(void);
 
+/**
+ * pci_ep_init() - Initialize pci endpoint devices
+ *
+ * It is called during the generic post-relocation init sequence.
+ *
+ * Return: 0 if OK
+ */
+int pci_ep_init(void);
+
 /**
  * init_cache_f_r() - Turn on the cache in preparation for relocation
  *
@@ -249,7 +258,6 @@ int set_cpu_clk_info(void);
 int update_flash_size(int flash_size);
 int arch_early_init_r(void);
 void pci_init(void);
-void pci_ep_init(void);
 int misc_init_r(void);
 #if defined(CONFIG_VID)
 int init_func_vid(void);