openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <oohall@gmail.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200110070207.439-2-oohall@gmail.com
This commit is contained in:
Oliver O'Halloran 2020-01-10 18:02:03 +11:00 committed by Michael Ellerman
parent 37f6f8e88c
commit 3ab3f3c9df
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,7 +958,7 @@ void pcibios_setup_bus_self(struct pci_bus *bus)
phb->controller_ops.dma_bus_setup(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; struct pci_controller *phb;
/* Fixup NUMA node as it may not be setup yet by the generic /* 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); pci_read_irq_line(dev);
if (ppc_md.pci_irq_fixup) if (ppc_md.pci_irq_fixup)
ppc_md.pci_irq_fixup(dev); 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) 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) int pcibios_add_device(struct pci_dev *dev)