Commit 3ab3f3c9 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

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: default avatarOliver O'Halloran <oohall@gmail.com>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200110070207.439-2-oohall@gmail.com
parent 37f6f8e8

arch/powerpc/kernel/pci-common.c

+2 −8
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE