Commit c62e3fae authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: pci: Use generic pci_enable_resources() for pcibios_enable_device(). 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0238a0d8

arch/sh/drivers/pci/pci.c

+1 −34
Original line number Diff line number Diff line
@@ -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);

}



/*