| Message ID | 1332713595-11120-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | a3a707257f4666b4bc2e3f4ddd9510f2b9f64aed |
| Headers | show |
Dear "Linus Walleij", In message <1332713595-11120-1-git-send-email-linus.walleij@linaro.org> you wrote: > 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> > --- > drivers/pci/fsl_pci_init.c | 5 ----- > include/pci.h | 6 +++++- > 2 files changed, 5 insertions(+), 6 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
Dear "Linus Walleij", In message <1332713595-11120-1-git-send-email-linus.walleij@linaro.org> you wrote: > 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> > --- > drivers/pci/fsl_pci_init.c | 5 ----- > include/pci.h | 6 +++++- > 2 files changed, 5 insertions(+), 6 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index d04a08c..1d75a82 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 7d98ad4..eba122f 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);
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> --- drivers/pci/fsl_pci_init.c | 5 ----- include/pci.h | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-)