diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-10-05 19:18:10 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-10-06 17:57:52 +0200 |
| commit | ab96b03144c5392b8c0c427cc37df34daa84c5d0 (patch) | |
| tree | 438c8ec0b7e8b2830ff7a08dd8a5717f46953426 | |
| parent | MIPS: PCI: Make pcibios_set_cache_line_size an initcall (diff) | |
| download | linux-ab96b03144c5392b8c0c427cc37df34daa84c5d0.tar.xz linux-ab96b03144c5392b8c0c427cc37df34daa84c5d0.zip | |
MIPS: PCI: Inline pcibios_assign_all_busses
The MIPS implementation of pcibios_assign_all_busses trivially returns
1. Implement it as a static function in asm/pci.h such that the compiler
can inline it & optimise out never-taken paths.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14343/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/include/asm/pci.h | 6 | ||||
| -rw-r--r-- | arch/mips/pci/pci.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 0564692c7d3b..acc651ec5014 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h @@ -66,8 +66,10 @@ extern int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin); /* Can be used to override the logic in pci_scan_bus for skipping already-configured bus numbers - to be used for buggy BIOSes or architectures with incomplete PCI setup by the loader */ - -extern unsigned int pcibios_assign_all_busses(void); +static inline unsigned int pcibios_assign_all_busses(void) +{ + return 1; +} extern unsigned long PCIBIOS_MIN_IO; extern unsigned long PCIBIOS_MIN_MEM; diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 30320a4c8909..8cc6ea4e9481 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -297,11 +297,6 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) return 0; } -unsigned int pcibios_assign_all_busses(void) -{ - return 1; -} - int pcibios_enable_device(struct pci_dev *dev, int mask) { int err; |