summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-03-25 12:13:15 +0000
committerWolfgang Denk <wd@denx.de>2012-03-30 22:46:00 +0200
commita3a707257f4666b4bc2e3f4ddd9510f2b9f64aed (patch)
tree918fc1613b44a2d977d3cb26347e52f641394330
parent8d96e1b03476d8e3b90ee3ff6e68238cb095478e (diff)
pci: declare pciauto functions in header
The FSL PCI driver uses local prototypes for pciauto_[pre|post]scan_setup_bridge(), this does not seem right, so move them to the <pci.h> file. Fixed a small extern declaration too, this is harmless but distracts the view since all other prototypes are explicitly external. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pci/fsl_pci_init.c5
-rw-r--r--include/pci.h6
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index d04a08c6e8..1d75a82bc3 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -47,11 +47,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define FSL_PCIE_CFG_RDY 0x4b0
#define FSL_PROG_IF_AGENT 0x1
-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);
-
#ifndef CONFIG_SYS_PCI_MEMORY_BUS
#define CONFIG_SYS_PCI_MEMORY_BUS 0
#endif
diff --git a/include/pci.h b/include/pci.h
index 7d98ad4161..eba122f8c0 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -527,8 +527,12 @@ extern void pciauto_setup_device(struct pci_controller *hose,
struct pci_region *mem,
struct pci_region *prefetch,
struct pci_region *io);
+extern void pciauto_prescan_setup_bridge(struct pci_controller *hose,
+ pci_dev_t dev, int sub_bus);
+extern void pciauto_postscan_setup_bridge(struct pci_controller *hose,
+ pci_dev_t dev, int sub_bus);
extern void pciauto_config_init(struct pci_controller *hose);
-int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
+extern 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);
extern pci_dev_t pci_find_devices (struct pci_device_id *ids, int index);