PCI: alpha: 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: - skips resources unless requested in "mask" - 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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
b81d988c04
commit
10f000a2fd
|
@ -372,28 +372,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
|
||||||
int
|
int
|
||||||
pcibios_enable_device(struct pci_dev *dev, int mask)
|
pcibios_enable_device(struct pci_dev *dev, int mask)
|
||||||
{
|
{
|
||||||
u16 cmd, oldcmd;
|
return pci_enable_resources(dev, mask);
|
||||||
int i;
|
|
||||||
|
|
||||||
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
|
||||||
oldcmd = cmd;
|
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
|
||||||
struct resource *res = &dev->resource[i];
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
cmd |= PCI_COMMAND_IO;
|
|
||||||
else if (res->flags & IORESOURCE_MEM)
|
|
||||||
cmd |= PCI_COMMAND_MEMORY;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cmd != oldcmd) {
|
|
||||||
printk(KERN_DEBUG "PCI: Enabling device: (%s), cmd %x\n",
|
|
||||||
pci_name(dev), cmd);
|
|
||||||
/* Enable the appropriate bits in the PCI command register. */
|
|
||||||
pci_write_config_word(dev, PCI_COMMAND, cmd);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue