Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d2a3661 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_on_node() 



pcibios_scan_root() looks up the bus's NUMA node, then calls
pci_scan_bus_on_node().  This uses pcibios_scan_root() directly and drops
the node lookup in the callers.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8d7d8186

arch/x86/pci/irq.c

+1 −3
Original line number Diff line number Diff line
@@ -136,11 +136,9 @@ static void __init pirq_peer_trick(void) 
		busmap[e->bus] = 1;

	}

	for (i = 1; i < 256; i++) {

		int node;

		if (!busmap[i] || pci_find_bus(0, i))

			continue;

		node = get_mp_bus_to_node(i);

		if (pci_scan_bus_on_node(i, &pci_root_ops, node))

		if (pcibios_scan_root(i))

			printk(KERN_INFO "PCI: Discovered primary peer "

			       "bus %02x [IRQ]\n", i);

	}

arch/x86/pci/legacy.c

+1 −3
Original line number Diff line number Diff line
@@ -37,19 +37,17 @@ int __init pci_legacy_init(void) 
void pcibios_scan_specific_bus(int busn)

{

	int devfn;

	long node;

	u32 l;



	if (pci_find_bus(0, busn))

		return;



	node = get_mp_bus_to_node(busn);

	for (devfn = 0; devfn < 256; devfn += 8) {

		if (!raw_pci_read(0, busn, devfn, PCI_VENDOR_ID, 2, &l) &&

		    l != 0x0000 && l != 0xffff) {

			DBG("Found device at %02x:%02x [%04x]\n", busn, devfn, l);

			printk(KERN_INFO "PCI: Discovered peer bus %02x\n", busn);

			pci_scan_bus_on_node(busn, &pci_root_ops, node);

			pcibios_scan_root(busn);

			return;

		}

	}