diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-03-04 11:56:49 -0700 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-26 11:09:48 +1100 |
| commit | 4554a63fdce5a6806fbfc87a76440ed581e8b831 (patch) | |
| tree | 143f99c42b5768b9e08eda3bf5da39b5182c1e98 /arch | |
| parent | 4b9b9fde1867fb705f2c8bd873d66a5bc17a8676 (diff) | |
PCI: arm: use generic pci_enable_resources()
Use the generic pci_enable_resources() instead of the arch-specific code.
Unlike this arch-specific code, the generic version:
- checks PCI_NUM_RESOURCES (11), not 6, resources
- skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
- skips ROM resources unless IORESOURCE_ROM_ENABLE is set
- checks for resource collisions with "!r->parent"
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/bios32.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index e5747547b44c..20f66422f588 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -660,28 +660,15 @@ void pcibios_align_resource(void *data, struct resource *res, */ int pcibios_enable_device(struct pci_dev *dev, int mask) { + int err; u16 cmd, old_cmd; - int idx; - struct resource *r; + + err = pci_enable_resources(dev, mask); + if (err < 0) + return err; pci_read_config_word(dev, PCI_COMMAND, &cmd); old_cmd = cmd; - for (idx = 0; idx < 6; idx++) { - /* Only set up the requested stuff */ - if (!(mask & (1 << idx))) - continue; - - r = dev->resource + idx; - if (!r->start && r->end) { - printk(KERN_ERR "PCI: Device %s not available because" - " of resource collisions\n", pci_name(dev)); - return -EINVAL; - } - if (r->flags & IORESOURCE_IO) - cmd |= PCI_COMMAND_IO; - if (r->flags & IORESOURCE_MEM) - cmd |= PCI_COMMAND_MEMORY; - } /* * Bridges (eg, cardbus bridges) need to be fully enabled @@ -690,8 +677,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY; if (cmd != old_cmd) { - printk("PCI: enabling device %s (%04x -> %04x)\n", - pci_name(dev), old_cmd, cmd); + dev_info(&dev->dev, "enabling bridge device (%04x -> %04x)\n", + old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; |