Commit 99bca615 authored by Ilya Lipnitskiy's avatar Ilya Lipnitskiy Committed by Thomas Bogendoerfer
Browse files

MIPS: pci-legacy: use generic pci_enable_resources 



Follow the reasoning from commit 842de40d ("PCI: add generic
pci_enable_resources()"):

  The only functional difference from the MIPS version is that the
  generic one uses "!r->parent" to check for resource collisions
  instead of "!r->start && r->end".

That should have no effect on any pci-legacy driver.

Suggested-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 0af83d2e

arch/mips/pci/pci-legacy.c

+2 −38
Original line number Diff line number Diff line
@@ -241,47 +241,11 @@ static int __init pcibios_init(void) 


subsys_initcall(pcibios_init);



static int pcibios_enable_resources(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) {

			pci_err(dev,

				"can't enable device: resource collisions\n");

			return -EINVAL;

		}

		if (r->flags & IORESOURCE_IO)

			cmd |= PCI_COMMAND_IO;

		if (r->flags & IORESOURCE_MEM)

			cmd |= PCI_COMMAND_MEMORY;

	}

	if (cmd != old_cmd) {

		pci_info(dev, "enabling device (%04x -> %04x)\n", old_cmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

	return 0;

}



int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	int err;

	int err = pci_enable_resources(dev, mask);



	if ((err = pcibios_enable_resources(dev, mask)) < 0)

	if (err < 0)

		return err;



	return pcibios_plat_dev_init(dev);