diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2010-01-08 14:43:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 09:34:10 -0800 |
| commit | 126cda50468d26c4c67f20c51a800685d42d1c61 (patch) | |
| tree | 6973dea92f24f2dadaf019afb5cf520f3514cbaa /arch/mn10300/unit-asb2305/pci.c | |
| parent | e716381f9f4ea65df2e2a911275b47ed6ae53d4b (diff) | |
| download | op-kernel-dev-126cda50468d26c4c67f20c51a800685d42d1c61.zip op-kernel-dev-126cda50468d26c4c67f20c51a800685d42d1c61.tar.gz | |
mn10300: 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>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mn10300/unit-asb2305/pci.c')
| -rw-r--r-- | arch/mn10300/unit-asb2305/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c index 082590f..02527ce 100644 --- a/arch/mn10300/unit-asb2305/pci.c +++ b/arch/mn10300/unit-asb2305/pci.c @@ -440,7 +440,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) { int err; - err = pcibios_enable_resources(dev, mask); + err = pci_enable_resources(dev, mask); if (err == 0) pcibios_enable_irq(dev); return err; @@ -455,6 +455,7 @@ static void __init unit_disable_pcnet(struct pci_bus *bus, struct pci_ops *o) bus->number = 0; + o->read (bus, PCI_DEVFN(2, 0), PCI_VENDOR_ID, 4, &x); o->read (bus, PCI_DEVFN(2, 0), PCI_COMMAND, 2, &x); x |= PCI_COMMAND_MASTER | PCI_COMMAND_IO | PCI_COMMAND_MEMORY | |
