pci: move pciauto_config_init() to pci.h

Fixing build regressions for the Integrator I get find that a few
boards try to work around the missing declaration of
pciauto_config_init() by declaring it in the local scope. This
does not make sense when the sibling functions are in <pci.h>
so move the function to the header, ridding the build error
in the Integrator and getting rid of the local declarations
here and there.

Reported-by:  Wolfgang Denk <wd@denx.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/board/esd/cpci750/pci.c b/board/esd/cpci750/pci.c
index a2c1c50624456b3155d6dd38528136286e38b1ca..24ab13f685536e461442316f505fc3beff44c5a0 100644 (file)
--- a/board/esd/cpci750/pci.c
+++ b/board/esd/cpci750/pci.c
@@ -29,7 +29,6 @@
 #include <pci.h>
 
 #ifdef CONFIG_PCI_PNP
-void pciauto_config_init(struct pci_controller *hose);
 int  pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned int *bar);
 #endif
 

diff --git a/board/prodrive/p3mx/pci.c b/board/prodrive/p3mx/pci.c
index e36b676643858b3e720f3c01739deebf9c41a8a3..712c21cf69b44ccecf4f2cb61a5c3f07e418f495 100644 (file)
--- a/board/prodrive/p3mx/pci.c
+++ b/board/prodrive/p3mx/pci.c
@@ -29,7 +29,6 @@
 #include <pci.h>
 
 #ifdef CONFIG_PCI_PNP
-void pciauto_config_init(struct pci_controller *hose);
 int  pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned int *bar);
 #endif
 

diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index bff1314a9d2c17f6fdf19fede038bd8f420ec749..d04a08c6e8fc8a3ebae404b82b3ac63d0b675ae5 100644 (file)
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -51,7 +51,6 @@ void pciauto_prescan_setup_bridge(struct pci_controller *hose,
                                pci_dev_t dev, int sub_bus);
 void pciauto_postscan_setup_bridge(struct pci_controller *hose,
                                pci_dev_t dev, int sub_bus);
-void pciauto_config_init(struct pci_controller *hose);
 
 #ifndef CONFIG_SYS_PCI_MEMORY_BUS
 #define CONFIG_SYS_PCI_MEMORY_BUS 0

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5f1f128126e0b54542a182c6d4a61f2c48590e01..398542b9e28d7279895de0e2d9c33a36a943e2fe 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -516,7 +516,6 @@ void pci_cfgfunc_do_nothing(struct pci_controller *hose,
  * to get the correct result when scanning bridges
  */
 extern int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
-extern void pciauto_config_init(struct pci_controller *hose);
 
 #if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI_SCAN_SHOW)
 const char * pci_class_str(u8 class)

diff --git a/include/pci.h b/include/pci.h
index 1284c427b51a45985118a834f5b79dc29522b123..7d98ad416189f92ca5430430dcb85c8d755fe13f 100644 (file)
--- a/include/pci.h
+++ b/include/pci.h
@@ -527,6 +527,7 @@ extern void pciauto_setup_device(struct pci_controller *hose,
                                 struct pci_region *mem,
                                 struct pci_region *prefetch,
                                 struct pci_region *io);
+extern void pciauto_config_init(struct pci_controller *hose);
 int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
 
 extern pci_dev_t pci_find_device (unsigned int vendor, unsigned int device, int index);