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

Commit e164f658 authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

PCI: Move out pci_enable_bridges out of assign_unsigned_bus_res 



So could use assign_unassigned_bus_res pci root bus add

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent a5213a31

drivers/pci/probe.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1905,6 +1905,7 @@ unsigned int __ref pci_rescan_bus(struct pci_bus *bus) 




	max = pci_scan_child_bus(bus);

	max = pci_scan_child_bus(bus);

	pci_assign_unassigned_bus_resources(bus);

	pci_assign_unassigned_bus_resources(bus);

	pci_enable_bridges(bus);

	pci_bus_add_devices(bus);

	pci_bus_add_devices(bus);





	return max;

	return max;

drivers/pci/setup-bus.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1566,6 +1566,4 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus) 
	up_read(&pci_bus_sem);

	up_read(&pci_bus_sem);

	__pci_bus_assign_resources(bus, &add_list, NULL);

	__pci_bus_assign_resources(bus, &add_list, NULL);

	BUG_ON(!list_empty(&add_list));

	BUG_ON(!list_empty(&add_list));



	pci_enable_bridges(bus);

}
 
}