aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-01-16 11:14:21 -0500
committerTom Rini <trini@konsulko.com>2021-01-16 11:14:21 -0500
commit14ea1b3635b4af8d9e283e3671f7ee872d50b859 (patch)
treeb8d1c05256b6f160a598656e797071081bd1f61e /drivers/pci/pci.c
parentb0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b (diff)
parent750c543ca74a80da4b67882deb967c80fe790c3f (diff)
Merge branch '2021-01-15-assorted-improvements'
- Add MBR partition layout writing supporting, clean up code. - A large number of assorted console/iomux cleanups - A large number of board_r related cleanups. - Log enhancements
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c6
1 files changed, 4 insertions, 2 deletions
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