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=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 587A0C433F5 for ; Tue, 14 Sep 2021 19:41:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38F866113B for ; Tue, 14 Sep 2021 19:41:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232322AbhINTmU (ORCPT ); Tue, 14 Sep 2021 15:42:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:55132 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230390AbhINTmT (ORCPT ); Tue, 14 Sep 2021 15:42:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1C1AB610CE; Tue, 14 Sep 2021 19:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631648461; bh=baphM1piCC4FQbHOOAlCGasKXJ2VO8dPR0S2rdQl73Y=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=uEsayntVSbGMThYuwz5EWNI9w58RbWvnLNLegJILzXScm9/SXS83sLEJClPypfuK1 NpnlZRSQIS4jjIGMpdedw4L/n178xqDYld1jV7Jckh7wTb8LVStfLXYUR3GxnVzXLV cj77pCNRMdLA966OG0aqD+kESfiowpk8HOqFV05QQuqyOIA3PWyVO8iJF8txql/vOc kowII0gv5gsEqOAF3bOeNMhU/u9N91sN3pU9opoeeAM2OiBYJxFPEvF6moLn65CVRm exNeCEbewWHw8Ms6ZwdFHSZm1Y0PJKzgddN4VEjRP1mJFGggsfd6wThwFcTqzmC6OK lFIuOheqNzFkg== Date: Tue, 14 Sep 2021 14:40:59 -0500 From: Bjorn Helgaas To: Oliver O'Halloran Cc: Michal Simek , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Niklas Schnelle , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , "David S. Miller" , Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org Subject: Re: [PATCH] pci: Rename pcibios_add_device to match Message-ID: <20210914194059.GA1448850@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210913152709.48013-1-oohall@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On Tue, Sep 14, 2021 at 01:27:08AM +1000, Oliver O'Halloran wrote: > The general convention for pcibios_* hooks is that they're named after > the corresponding pci_* function they provide a hook for. The exception > is pcibios_add_device() which provides a hook for pci_device_add(). This > has been irritating me for years so rename it. > > Also, remove the export of the microblaze version. The only caller > must be compiled as a built-in so there's no reason for the export. > > Signed-off-by: Oliver O'Halloran I fixed up the subject so it matches previous history and applied to pci/enumeration for v5.16, thanks! Stuff like this really annoys me, too. > --- > arch/microblaze/pci/pci-common.c | 3 +-- > arch/powerpc/kernel/pci-common.c | 2 +- > arch/powerpc/platforms/powernv/pci-sriov.c | 2 +- > arch/s390/pci/pci.c | 2 +- > arch/sparc/kernel/pci.c | 2 +- > arch/x86/pci/common.c | 2 +- > drivers/pci/pci.c | 4 ++-- > drivers/pci/probe.c | 4 ++-- > include/linux/pci.h | 2 +- > 9 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c > index 557585f1be41..622a4867f9e9 100644 > --- a/arch/microblaze/pci/pci-common.c > +++ b/arch/microblaze/pci/pci-common.c > @@ -587,13 +587,12 @@ static void pcibios_fixup_resources(struct pci_dev *dev) > } > DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources); > > -int pcibios_add_device(struct pci_dev *dev) > +int pcibios_device_add(struct pci_dev *dev) > { > dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); > > return 0; > } > -EXPORT_SYMBOL(pcibios_add_device); > > /* > * Reparent resource children of pr that conflict with res > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c > index c3573430919d..6749905932f4 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -1059,7 +1059,7 @@ void pcibios_bus_add_device(struct pci_dev *dev) > ppc_md.pcibios_bus_add_device(dev); > } > > -int pcibios_add_device(struct pci_dev *dev) > +int pcibios_device_add(struct pci_dev *dev) > { > struct irq_domain *d; > > diff --git a/arch/powerpc/platforms/powernv/pci-sriov.c b/arch/powerpc/platforms/powernv/pci-sriov.c > index 28aac933a439..486c2937b159 100644 > --- a/arch/powerpc/platforms/powernv/pci-sriov.c > +++ b/arch/powerpc/platforms/powernv/pci-sriov.c > @@ -54,7 +54,7 @@ > * to "new_size", calculated above. Implementing this is a convoluted process > * which requires several hooks in the PCI core: > * > - * 1. In pcibios_add_device() we call pnv_pci_ioda_fixup_iov(). > + * 1. In pcibios_device_add() we call pnv_pci_ioda_fixup_iov(). > * > * At this point the device has been probed and the device's BARs are sized, > * but no resource allocations have been done. The SR-IOV BARs are sized > diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c > index e7e6788d75a8..ded3321b7208 100644 > --- a/arch/s390/pci/pci.c > +++ b/arch/s390/pci/pci.c > @@ -561,7 +561,7 @@ static void zpci_cleanup_bus_resources(struct zpci_dev *zdev) > zdev->has_resources = 0; > } > > -int pcibios_add_device(struct pci_dev *pdev) > +int pcibios_device_add(struct pci_dev *pdev) > { > struct zpci_dev *zdev = to_zpci(pdev); > struct resource *res; > diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c > index 9c2b720bfd20..31b0c1983286 100644 > --- a/arch/sparc/kernel/pci.c > +++ b/arch/sparc/kernel/pci.c > @@ -1010,7 +1010,7 @@ void pcibios_set_master(struct pci_dev *dev) > } > > #ifdef CONFIG_PCI_IOV > -int pcibios_add_device(struct pci_dev *dev) > +int pcibios_device_add(struct pci_dev *dev) > { > struct pci_dev *pdev; > > diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c > index 3507f456fcd0..9e1e6b8d8876 100644 > --- a/arch/x86/pci/common.c > +++ b/arch/x86/pci/common.c > @@ -632,7 +632,7 @@ static void set_dev_domain_options(struct pci_dev *pdev) > pdev->hotplug_user_indicators = 1; > } > > -int pcibios_add_device(struct pci_dev *dev) > +int pcibios_device_add(struct pci_dev *dev) > { > struct pci_setup_rom *rom; > struct irq_domain *msidom; > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index ce2ab62b64cf..c63598c1cdd8 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -2091,14 +2091,14 @@ void pcim_pin_device(struct pci_dev *pdev) > EXPORT_SYMBOL(pcim_pin_device); > > /* > - * pcibios_add_device - provide arch specific hooks when adding device dev > + * pcibios_device_add - provide arch specific hooks when adding device dev > * @dev: the PCI device being added > * > * Permits the platform to provide architecture specific functionality when > * devices are added. This is the default implementation. Architecture > * implementations can override this. > */ > -int __weak pcibios_add_device(struct pci_dev *dev) > +int __weak pcibios_device_add(struct pci_dev *dev) > { > return 0; > } > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index d9fc02a71baa..2ba43b6adf31 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -2450,7 +2450,7 @@ static struct irq_domain *pci_dev_msi_domain(struct pci_dev *dev) > struct irq_domain *d; > > /* > - * If a domain has been set through the pcibios_add_device() > + * If a domain has been set through the pcibios_device_add() > * callback, then this is the one (platform code knows best). > */ > d = dev_get_msi_domain(&dev->dev); > @@ -2518,7 +2518,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) > list_add_tail(&dev->bus_list, &bus->devices); > up_write(&pci_bus_sem); > > - ret = pcibios_add_device(dev); > + ret = pcibios_device_add(dev); > WARN_ON(ret < 0); > > /* Set up MSI IRQ domain */ > diff --git a/include/linux/pci.h b/include/linux/pci.h > index cd8aa6fce204..7e0ce3a4d5a1 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -2126,7 +2126,7 @@ void pcibios_disable_device(struct pci_dev *dev); > void pcibios_set_master(struct pci_dev *dev); > int pcibios_set_pcie_reset_state(struct pci_dev *dev, > enum pcie_reset_state state); > -int pcibios_add_device(struct pci_dev *dev); > +int pcibios_device_add(struct pci_dev *dev); > void pcibios_release_device(struct pci_dev *dev); > #ifdef CONFIG_PCI > void pcibios_penalize_isa_irq(int irq, int active); > -- > 2.31.1 >