| Message ID | 20200821002946.982695529@linutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | x86, PCI, XEN, genirq ...: Prepare for device MSI | expand |
s/Reducde/Reduce/ (in subject) On Fri, Aug 21, 2020 at 02:24:41AM +0200, Thomas Gleixner wrote: > Adding a function call before the first #ifdef in arch_pci_init() triggers > a 'mixed declarations and code' warning if PCI_DIRECT is enabled. > > Use stub functions and move the #ifdeffery to the header file where it is > not in the way. > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: linux-pci@vger.kernel.org Nice cleanup, thanks. Glad to get rid of the useless initializer, too. Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > arch/x86/include/asm/pci_x86.h | 11 +++++++++++ > arch/x86/pci/init.c | 10 +++------- > 2 files changed, 14 insertions(+), 7 deletions(-) > > --- a/arch/x86/include/asm/pci_x86.h > +++ b/arch/x86/include/asm/pci_x86.h > @@ -114,9 +114,20 @@ extern const struct pci_raw_ops pci_dire > extern bool port_cf9_safe; > > /* arch_initcall level */ > +#ifdef CONFIG_PCI_DIRECT > extern int pci_direct_probe(void); > extern void pci_direct_init(int type); > +#else > +static inline int pci_direct_probe(void) { return -1; } > +static inline void pci_direct_init(int type) { } > +#endif > + > +#ifdef CONFIG_PCI_BIOS > extern void pci_pcbios_init(void); > +#else > +static inline void pci_pcbios_init(void) { } > +#endif > + > extern void __init dmi_check_pciprobe(void); > extern void __init dmi_check_skip_isa_align(void); > > --- a/arch/x86/pci/init.c > +++ b/arch/x86/pci/init.c > @@ -8,11 +8,9 @@ > in the right sequence from here. */ > static __init int pci_arch_init(void) > { > -#ifdef CONFIG_PCI_DIRECT > - int type = 0; > + int type; > > type = pci_direct_probe(); > -#endif > > if (!(pci_probe & PCI_PROBE_NOEARLY)) > pci_mmcfg_early_init(); > @@ -20,18 +18,16 @@ static __init int pci_arch_init(void) > if (x86_init.pci.arch_init && !x86_init.pci.arch_init()) > return 0; > > -#ifdef CONFIG_PCI_BIOS > pci_pcbios_init(); > -#endif > + > /* > * don't check for raw_pci_ops here because we want pcbios as last > * fallback, yet it's needed to run first to set pcibios_last_bus > * in case legacy PCI probing is used. otherwise detecting peer busses > * fails. > */ > -#ifdef CONFIG_PCI_DIRECT > pci_direct_init(type); > -#endif > + > if (!raw_pci_ops && !raw_pci_ext_ops) > printk(KERN_ERR > "PCI: Fatal: No config space access function found\n"); >
--- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -114,9 +114,20 @@ extern const struct pci_raw_ops pci_dire extern bool port_cf9_safe; /* arch_initcall level */ +#ifdef CONFIG_PCI_DIRECT extern int pci_direct_probe(void); extern void pci_direct_init(int type); +#else +static inline int pci_direct_probe(void) { return -1; } +static inline void pci_direct_init(int type) { } +#endif + +#ifdef CONFIG_PCI_BIOS extern void pci_pcbios_init(void); +#else +static inline void pci_pcbios_init(void) { } +#endif + extern void __init dmi_check_pciprobe(void); extern void __init dmi_check_skip_isa_align(void); --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c @@ -8,11 +8,9 @@ in the right sequence from here. */ static __init int pci_arch_init(void) { -#ifdef CONFIG_PCI_DIRECT - int type = 0; + int type; type = pci_direct_probe(); -#endif if (!(pci_probe & PCI_PROBE_NOEARLY)) pci_mmcfg_early_init(); @@ -20,18 +18,16 @@ static __init int pci_arch_init(void) if (x86_init.pci.arch_init && !x86_init.pci.arch_init()) return 0; -#ifdef CONFIG_PCI_BIOS pci_pcbios_init(); -#endif + /* * don't check for raw_pci_ops here because we want pcbios as last * fallback, yet it's needed to run first to set pcibios_last_bus * in case legacy PCI probing is used. otherwise detecting peer busses * fails. */ -#ifdef CONFIG_PCI_DIRECT pci_direct_init(type); -#endif + if (!raw_pci_ops && !raw_pci_ext_ops) printk(KERN_ERR "PCI: Fatal: No config space access function found\n");
Adding a function call before the first #ifdef in arch_pci_init() triggers a 'mixed declarations and code' warning if PCI_DIRECT is enabled. Use stub functions and move the #ifdeffery to the header file where it is not in the way. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: linux-pci@vger.kernel.org --- arch/x86/include/asm/pci_x86.h | 11 +++++++++++ arch/x86/pci/init.c | 10 +++------- 2 files changed, 14 insertions(+), 7 deletions(-)