diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-16 06:01:58 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-16 06:01:58 +0900 |
| commit | 8c6b44d00aca45edf69b35220ba4dce962c482f8 (patch) | |
| tree | e6d011180cf99d7541c1f12d0605025353fd81c3 /arch/sh/drivers/pci/pci.c | |
| parent | 8b27fc6de184d66347e4aceeb5c0a4262732cc03 (diff) | |
| download | linux-3.10-8c6b44d00aca45edf69b35220ba4dce962c482f8.tar.gz linux-3.10-8c6b44d00aca45edf69b35220ba4dce962c482f8.tar.bz2 linux-3.10-8c6b44d00aca45edf69b35220ba4dce962c482f8.zip | |
sh: pci: Allow register_pci_controller() to handle overlapping regions.
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>
Diffstat (limited to 'arch/sh/drivers/pci/pci.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 54d77cbb8b3..9a1c423ad16 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -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) |