From: Oliver O'Halloran Date: Fri, 10 Jan 2020 07:02:03 +0000 (+1100) Subject: powerpc/pci: Fold pcibios_setup_device() into pcibios_bus_add_device() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3ab3f3c9df348324029e3fbdf381f551b1df8f1e;p=linux.git powerpc/pci: Fold pcibios_setup_device() into pcibios_bus_add_device() pcibios_bus_add_device() is the only caller of pcibios_setup_device(). Fold them together since there's no real reason to keep them separate. Signed-off-by: Oliver O'Halloran Reviewed-by: Alexey Kardashevskiy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200110070207.439-2-oohall@gmail.com --- diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index f8a59d7b724cd..c6c03416a1514 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -958,7 +958,7 @@ void pcibios_setup_bus_self(struct pci_bus *bus) phb->controller_ops.dma_bus_setup(bus); } -static void pcibios_setup_device(struct pci_dev *dev) +void pcibios_bus_add_device(struct pci_dev *dev) { struct pci_controller *phb; /* Fixup NUMA node as it may not be setup yet by the generic @@ -979,15 +979,9 @@ static void pcibios_setup_device(struct pci_dev *dev) pci_read_irq_line(dev); if (ppc_md.pci_irq_fixup) ppc_md.pci_irq_fixup(dev); -} - -void pcibios_bus_add_device(struct pci_dev *pdev) -{ - /* Perform platform-specific device setup */ - pcibios_setup_device(pdev); if (ppc_md.pcibios_bus_add_device) - ppc_md.pcibios_bus_add_device(pdev); + ppc_md.pcibios_bus_add_device(dev); } int pcibios_add_device(struct pci_dev *dev)