diff options
| author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2020-11-28 11:43:12 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-15 22:36:12 +0300 |
| commit | b9f6d0f7db9ef57f77ec3bd23a50a160534efbd8 (patch) | |
| tree | 3471bcdd2358e3ea1653d04cf8c7c9a9d039f080 /drivers | |
| parent | c343e8c0bfe5be18d766c25d9d1de3d843793109 (diff) | |
| download | u-boot-b9f6d0f7db9ef57f77ec3bd23a50a160534efbd8.tar.xz | |
common: board_r: Drop initr_pci wrapper
Add a return value to pci_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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci-uclass.c | 4 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 4cdd06b125..ba65f47e80 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1842,7 +1842,7 @@ U_BOOT_DRIVER(pci_generic_drv) = { .of_match = pci_generic_ids, }; -void pci_init(void) +int pci_init(void) { struct udevice *bus; @@ -1855,4 +1855,6 @@ void pci_init(void) uclass_next_device_check(&bus)) { ; } + + return 0; } diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 664e8379eb..a7453e5755 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -454,16 +454,18 @@ int pci_hose_scan(struct pci_controller *hose) return pci_hose_scan_bus(hose, hose->current_busno); } -void pci_init(void) +int pci_init(void) { hose_head = NULL; /* allow env to disable pci init/enum */ if (env_get("pcidisable") != NULL) - return; + return 0; /* now call board specific pci_init()... */ pci_init_board(); + + return 0; } /* Returns the address of the requested capability structure within the |