renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 17:23:55 +08:00
Code

PCI: Rename pcibios_add_device() to pcibios_device_add()

Browse Source 
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().

Rename pcibios_add_device() to pcibios_device_add() so it matches
pci_device_add().

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.

Link: https://lore.kernel.org/r/20210913152709.48013-1-oohall@gmail.com
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Niklas Schnelle <schnelle@linux.ibm.com>	# s390
This commit is contained in:
Oliver O'Halloran 2021-09-14 01:27:08 +10:00 committed by Bjorn Helgaas
parent e4e737bb5c
commit 06dc660e6e
9 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/microblaze/pci/pci-common.c
View File

@ -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); 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); dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
return 0; return 0;
} }
EXPORT_SYMBOL(pcibios_add_device);
/* /*
* Reparent resource children of pr that conflict with res * Reparent resource children of pr that conflict with res

2
arch/powerpc/kernel/pci-common.c
View File

@ -1059,7 +1059,7 @@ void pcibios_bus_add_device(struct pci_dev *dev)
ppc_md.pcibios_bus_add_device(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; struct irq_domain *d;

2
arch/powerpc/platforms/powernv/pci-sriov.c
View File

@ -54,7 +54,7 @@
* to "new_size", calculated above. Implementing this is a convoluted process * to "new_size", calculated above. Implementing this is a convoluted process
* which requires several hooks in the PCI core: * 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, * 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 * but no resource allocations have been done. The SR-IOV BARs are sized

2
arch/s390/pci/pci.c
View File

@ -561,7 +561,7 @@ static void zpci_cleanup_bus_resources(struct zpci_dev *zdev)
zdev->has_resources = 0; 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 zpci_dev *zdev = to_zpci(pdev);
struct resource *res; struct resource *res;

2
arch/sparc/kernel/pci.c
View File

@ -1010,7 +1010,7 @@ void pcibios_set_master(struct pci_dev *dev)
} }
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
int pcibios_add_device(struct pci_dev *dev) int pcibios_device_add(struct pci_dev *dev)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;

2
arch/x86/pci/common.c
View File

@ -632,7 +632,7 @@ static void set_dev_domain_options(struct pci_dev *pdev)
pdev->hotplug_user_indicators = 1; 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 pci_setup_rom *rom;
struct irq_domain *msidom; struct irq_domain *msidom;

4
drivers/pci/pci.c
View File

@ -2091,14 +2091,14 @@ void pcim_pin_device(struct pci_dev *pdev)
EXPORT_SYMBOL(pcim_pin_device); 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 * @dev: the PCI device being added
* *
* Permits the platform to provide architecture specific functionality when * Permits the platform to provide architecture specific functionality when
* devices are added. This is the default implementation. Architecture * devices are added. This is the default implementation. Architecture
* implementations can override this. * implementations can override this.
*/ */
int __weak pcibios_add_device(struct pci_dev *dev) int __weak pcibios_device_add(struct pci_dev *dev)
{ {
return 0; return 0;
} }

4
drivers/pci/probe.c
View File

@ -2450,7 +2450,7 @@ static struct irq_domain *pci_dev_msi_domain(struct pci_dev *dev)
struct irq_domain *d; 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). * callback, then this is the one (platform code knows best).
*/ */
d = dev_get_msi_domain(&dev->dev); 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); list_add_tail(&dev->bus_list, &bus->devices);
up_write(&pci_bus_sem); up_write(&pci_bus_sem);
ret = pcibios_add_device(dev); ret = pcibios_device_add(dev);
WARN_ON(ret < 0); WARN_ON(ret < 0);
/* Set up MSI IRQ domain */ /* Set up MSI IRQ domain */

2
include/linux/pci.h
View File

@ -2126,7 +2126,7 @@ void pcibios_disable_device(struct pci_dev *dev);
void pcibios_set_master(struct pci_dev *dev); void pcibios_set_master(struct pci_dev *dev);
int pcibios_set_pcie_reset_state(struct pci_dev *dev, int pcibios_set_pcie_reset_state(struct pci_dev *dev,
enum pcie_reset_state state); 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); void pcibios_release_device(struct pci_dev *dev);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
void pcibios_penalize_isa_irq(int irq, int active); void pcibios_penalize_isa_irq(int irq, int active);