From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE89BC433DF for ; Tue, 25 Aug 2020 20:20:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D166B2074D for ; Tue, 25 Aug 2020 20:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598386808; bh=SS+t45IQlef2ZNO8GZOFRl2+c25Lro4JNuNwmNwc8zQ=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=ZuVZ29GhKqdrvWMVY8WgPu/PmdoprCFSoMSDHX1pgQx2NgYUnX8xQLfbdlzz87SVT Mtjbej7NGaXTE0jRl3hAV6S/JJtvXFwtPc1guAHotEFZ41A64L2FjuGLE/45TyF48c /KJMPYrnWkDNQcTukCtMJgEjLDDXwkFL0S5MHugM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726630AbgHYUUE (ORCPT ); Tue, 25 Aug 2020 16:20:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:59272 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726149AbgHYUUD (ORCPT ); Tue, 25 Aug 2020 16:20:03 -0400 Received: from localhost (104.sub-72-107-126.myvzw.com [72.107.126.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 01E6D2074D; Tue, 25 Aug 2020 20:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598386802; bh=SS+t45IQlef2ZNO8GZOFRl2+c25Lro4JNuNwmNwc8zQ=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=UeuOVm1ZSIo+ErhE6OlxewMDFPnV4NsWvJxM77q2rQm3Y6ZJ+3mnLIcJH7jIXO4EC /XE+2wmGjyHazKgT/AJKml79ce5k1iC5Q8WKAKcLKlgCau+LQEJi/95s8aaS2ETMil Wsikip6rcjjaxBoIOlqOC42TYjOKJ7dhkIDcMCCw= Date: Tue, 25 Aug 2020 15:20:00 -0500 From: Bjorn Helgaas To: Thomas Gleixner Cc: LKML , x86@kernel.org, linux-pci@vger.kernel.org, Joerg Roedel , iommu@lists.linux-foundation.org, linux-hyperv@vger.kernel.org, Haiyang Zhang , Jon Derrick , Lu Baolu , Wei Liu , "K. Y. Srinivasan" , Stephen Hemminger , Steve Wahl , Dimitri Sivanich , Russ Anderson , Bjorn Helgaas , Lorenzo Pieralisi , Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org, Juergen Gross , Boris Ostrovsky , Stefano Stabellini , Marc Zyngier , Greg Kroah-Hartman , "Rafael J. Wysocki" , Megha Dey , Jason Gunthorpe , Dave Jiang , Alex Williamson , Jacob Pan , Baolu Lu , Kevin Tian , Dan Williams Subject: Re: [patch RFC 17/38] x86/pci: Reducde #ifdeffery in PCI init code Message-ID: <20200825202000.GA1925088@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200821002946.982695529@linutronix.de> Sender: linux-hyperv-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org 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 > Cc: linux-pci@vger.kernel.org Nice cleanup, thanks. Glad to get rid of the useless initializer, too. Acked-by: Bjorn Helgaas > --- > 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"); >