Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d981f163 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman
Browse files

PCI: ia64: 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:
    - does not check for a NULL dev pointer
    - skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 10f000a2

arch/ia64/pci/pci.c

+1 −43
Original line number Diff line number Diff line
@@ -504,54 +504,12 @@ pcibios_update_irq (struct pci_dev *dev, int irq) 
	/* ??? FIXME -- record old value for shutdown.  */

}



static inline int

pcibios_enable_resources (struct pci_dev *dev, int mask)

{

	u16 cmd, old_cmd;

	int idx;

	struct resource *r;

	unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM;



	if (!dev)

		return -EINVAL;



	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	old_cmd = cmd;

	for (idx=0; idx<PCI_NUM_RESOURCES; idx++) {

		/* Only set up the desired resources.  */

		if (!(mask & (1 << idx)))

			continue;



		r = &dev->resource[idx];

		if (!(r->flags & type_mask))

			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;

}



int

pcibios_enable_device (struct pci_dev *dev, int mask)

{

	int ret;



	ret = pcibios_enable_resources(dev, mask);

	ret = pci_enable_resources(dev, mask);

	if (ret < 0)

		return ret;