diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-09-19 13:51:15 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-09-19 13:51:15 +0900 |
| commit | c62e3fae58198fc1f5d7922f84fe91b3fcf61177 (patch) | |
| tree | c1058ab14f20fe39f79105c8f6110406ae3d8682 /arch/sh/drivers | |
| parent | 0238a0d8c3846f5c1f9db0dabe504481751e58e8 (diff) | |
| download | blackbird-op-linux-c62e3fae58198fc1f5d7922f84fe91b3fcf61177.tar.gz blackbird-op-linux-c62e3fae58198fc1f5d7922f84fe91b3fcf61177.zip | |
sh: pci: Use generic pci_enable_resources() for pcibios_enable_device().
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 1e9598d2bbf4..e4c988d46ad5 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -233,40 +233,7 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, int pcibios_enable_device(struct pci_dev *dev, int mask) { - u16 cmd, old_cmd; - int idx; - struct resource *r; - - pci_read_config_word(dev, PCI_COMMAND, &cmd); - old_cmd = cmd; - for (idx=0; idx < PCI_NUM_RESOURCES; idx++) { - /* Only set up the requested stuff */ - if (!(mask & (1<<idx))) - continue; - - r = &dev->resource[idx]; - if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) - continue; - if ((idx == PCI_ROM_RESOURCE) && - (!(r->flags & IORESOURCE_ROM_ENABLE))) - continue; - 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; - } - if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", - pci_name(dev), old_cmd, cmd); - pci_write_config_word(dev, PCI_COMMAND, cmd); - } - return 0; + return pci_enable_resources(dev, mask); } /* |
