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

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

x86/PCI: Factor out pcibios_allocate_bridge_resources() 



Thus pcibios_allocate_bus_resources() could more simple and clean.

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

arch/x86/pci/i386.c

+24 −22
Original line number Diff line number Diff line
@@ -193,23 +193,16 @@ EXPORT_SYMBOL(pcibios_align_resource); 
 *	    as well.

 */



static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)

static void __init pcibios_allocate_bridge_resources(struct pci_dev *dev)

{

	struct pci_bus *bus;

	struct pci_dev *dev;

	int idx;

	struct resource *r;



	/* Depth-First Search on bus tree */

	list_for_each_entry(bus, bus_list, node) {

		if ((dev = bus->self)) {

			for (idx = PCI_BRIDGE_RESOURCES;

			    idx < PCI_NUM_RESOURCES; idx++) {

	for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {

		r = &dev->resource[idx];

		if (!r->flags)

			continue;

				if (!r->start ||

				    pci_claim_resource(dev, idx) < 0) {

		if (!r->start || pci_claim_resource(dev, idx) < 0) {

			/*

			 * Something is wrong with the region.

			 * Invalidate the resource to prevent
@@ -221,6 +214,15 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 
		}

	}

}



static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)

{

	struct pci_bus *bus;



	/* Depth-First Search on bus tree */

	list_for_each_entry(bus, bus_list, node) {

		if (bus->self)

			pcibios_allocate_bridge_resources(bus->self);

		pcibios_allocate_bus_resources(&bus->children);

	}

}