sh: pci: Allow register_pci_controller() to handle overlapping regions. (8c6b44d0) · Commits · 戴 / test

Some host controllers (such as SH7786) have overlapping regions that are fixed in hardware. The resource allocator does the right thing in managing this space already, so the conflict case is non-fatal. Signed-off-by:

Paul Mundt <lethal@linux-sh.org>

arch/sh/drivers/pci/pci.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -53,12 +53,8 @@ static DEFINE_MUTEX(pci_scan_mutex);

		void __devinit register_pci_controller(struct pci_channel *hose)
		{
		if (request_resource(&iomem_resource, hose->mem_resource) < 0)
		goto out;
		if (request_resource(&ioport_resource, hose->io_resource) < 0) {
		release_resource(hose->mem_resource);
		goto out;
		}
		request_resource(&iomem_resource, hose->mem_resource);
		request_resource(&ioport_resource, hose->io_resource);

		*hose_tail = hose;
		hose_tail = &hose->next;
		@@ -80,12 +76,6 @@ void __devinit register_pci_controller(struct pci_channel *hose)
		pcibios_scanbus(hose);
		mutex_unlock(&pci_scan_mutex);
		}

		return;

		out:
		printk(KERN_WARNING
		"Skipping PCI bus scan due to resource conflict\n");
		}

		static int __init pcibios_init(void)

Admin message