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

Commit 126cda50 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

mn10300: 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:

 - checks PCI_NUM_RESOURCES (11), not 6, resources
 - 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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e716381f

arch/mn10300/unit-asb2305/pci-asb2305.c

+0 −39
Original line number Diff line number Diff line
@@ -218,45 +218,6 @@ void __init pcibios_resource_survey(void) 
	pcibios_allocate_resources(1);

}



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 < 6; idx++) {

		/* Only set up the requested stuff */

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

			continue;



		r = &dev->resource[idx];



		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 (dev->resource[PCI_ROM_RESOURCE].start)

		cmd |= PCI_COMMAND_MEMORY;



	if (cmd != old_cmd)

		pci_write_config_word(dev, PCI_COMMAND, cmd);



	return 0;

}



/*

 *  If we set up a device for bus mastering, we need to check the latency

 *  timer as certain crappy BIOSes forget to set it properly.

arch/mn10300/unit-asb2305/pci-asb2305.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ extern unsigned int pci_probe; 
extern unsigned int pcibios_max_latency;



extern void pcibios_resource_survey(void);

extern int pcibios_enable_resources(struct pci_dev *dev, int mask);



/* pci.c */

arch/mn10300/unit-asb2305/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
{

	int err;



	err = pcibios_enable_resources(dev, mask);

	err = pci_enable_resources(dev, mask);

	if (err == 0)

		pcibios_enable_irq(dev);

	return err;
@@ -455,6 +455,7 @@ static void __init unit_disable_pcnet(struct pci_bus *bus, struct pci_ops *o) 


	bus->number = 0;



	o->read (bus, PCI_DEVFN(2, 0), PCI_VENDOR_ID,		4, &x);

	o->read (bus, PCI_DEVFN(2, 0), PCI_COMMAND,		2, &x);

	x |= PCI_COMMAND_MASTER |

		PCI_COMMAND_IO | PCI_COMMAND_MEMORY |