From bjorn.helgaas@hp.com Tue Mar 4 16:14:37 2008 From: Bjorn Helgaas Date: Tue, 04 Mar 2008 11:56:59 -0700 Subject: PCI: sparc64: use generic pci_enable_resources() To: linux-pci@atrey.karlin.mff.cuni.cz To: linux-arch@vger.kernel.org Cc: Russell King Cc: linux-arm-kernel@lists.arm.linux.org.uk Cc: Kyle McMartin Cc: Matthew Wilcox Cc: Grant Grundler Cc: linux-parisc@vger.kernel.org Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: linuxppc-dev@ozlabs.org Cc: Chris Zankel Message-ID: <20080304185822.341747405@ldl.fc.hp.com> Use the generic pci_enable_resources() instead of the arch-specific code. Unlike this arch-specific code, the generic version: - 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 Signed-off-by: Greg Kroah-Hartman --- arch/sparc64/kernel/pci.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c @@ -927,32 +927,7 @@ void pcibios_align_resource(void *data, int pcibios_enable_device(struct pci_dev *dev, int mask) { - u16 cmd, oldcmd; - 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]; - - /* Only set up the requested stuff */ - if (!(mask & (1<flags & IORESOURCE_IO) - cmd |= PCI_COMMAND_IO; - 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; + return pci_enable_resources(dev, mask); } void pcibios_resource_to_bus(struct pci_dev *pdev, struct pci_bus_region *region,