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

Commit 89a74ecc authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs 



No functional change; this converts loops that iterate from 0 to
PCI_BUS_NUM_RESOURCES through pci_bus resource[] table to use the
pci_bus_for_each_resource() iterator instead.

This doesn't change the way resources are stored; it merely removes
dependencies on the fact that they're in a table.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 2adf7516

arch/ia64/pci/pci.c

+2 −3
Original line number Diff line number Diff line
@@ -452,13 +452,12 @@ EXPORT_SYMBOL(pcibios_bus_to_resource); 
static int __devinit is_valid_resource(struct pci_dev *dev, int idx)

{

	unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;

	struct resource *devr = &dev->resource[idx];

	struct resource *devr = &dev->resource[idx], *busr;



	if (!dev->bus)

		return 0;

	for (i=0; i<PCI_BUS_NUM_RESOURCES; i++) {

		struct resource *busr = dev->bus->resource[i];



	pci_bus_for_each_resource(dev->bus, busr, i) {

		if (!busr || ((busr->flags ^ devr->flags) & type_mask))

			continue;

		if ((devr->start) && (devr->start >= busr->start) &&

arch/mn10300/unit-asb2305/pci.c

+2 −4
Original line number Diff line number Diff line
@@ -331,12 +331,10 @@ static int __init pci_check_direct(void) 
static int __devinit is_valid_resource(struct pci_dev *dev, int idx)

{

	unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;

	struct resource *devr = &dev->resource[idx];

	struct resource *devr = &dev->resource[idx], *busr;



	if (dev->bus) {

		for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {

			struct resource *busr = dev->bus->resource[i];



		pci_bus_for_each_resource(dev->bus, busr, i) {

			if (!busr || (busr->flags ^ devr->flags) & type_mask)

				continue;

arch/powerpc/kernel/pci-common.c

+4 −7
Original line number Diff line number Diff line
@@ -1047,10 +1047,8 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus) 


	struct pci_dev *dev = bus->self;



	for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {

		if ((res = bus->resource[i]) == NULL)

			continue;

		if (!res->flags)

	pci_bus_for_each_resource(bus, res, i) {

		if (!res || !res->flags)

			continue;

		if (i >= 3 && bus->self->transparent)

			continue;
@@ -1277,9 +1275,8 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus) 
	pr_debug("PCI: Allocating bus resources for %04x:%02x...\n",

		 pci_domain_nr(bus), bus->number);



	for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {

		if ((res = bus->resource[i]) == NULL || !res->flags

		    || res->start > res->end || res->parent)

	pci_bus_for_each_resource(bus, res, i) {

		if (!res || !res->flags || res->start > res->end || res->parent)

			continue;

		if (bus->parent == NULL)

			pr = (res->flags & IORESOURCE_IO) ?

arch/powerpc/platforms/fsl_uli1575.c

+6 −6
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev) 
	int i;

	u8 *dummy;

	struct pci_bus *bus = dev->bus;

	struct resource *res;

	resource_size_t end = 0;



	for (i = PCI_BRIDGE_RESOURCES; i < PCI_BRIDGE_RESOURCES+3; i++) {
@@ -230,13 +231,12 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev) 
			end = pci_resource_end(dev, i);

	}



	for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {

		if ((bus->resource[i]) &&

			(bus->resource[i]->flags & IORESOURCE_MEM)) {

			if (bus->resource[i]->end == end)

				dummy = ioremap(bus->resource[i]->start, 0x4);

	pci_bus_for_each_resource(bus, res, i) {

		if (res && res->flags & IORESOURCE_MEM) {

			if (res->end == end)

				dummy = ioremap(res->start, 0x4);

			else

				dummy = ioremap(bus->resource[i]->end - 3, 0x4);

				dummy = ioremap(res->end - 3, 0x4);

			if (dummy) {

				in_8(dummy);

				iounmap(dummy);

drivers/pci/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, 
		void *alignf_data)

{

	int i, ret = -ENOMEM;

	struct resource *r;

	resource_size_t max = -1;



	type_mask |= IORESOURCE_IO | IORESOURCE_MEM;
@@ -51,8 +52,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, 
	if (!(res->flags & IORESOURCE_MEM_64))

		max = PCIBIOS_MAX_MEM_32;



	for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {

		struct resource *r = bus->resource[i];

	pci_bus_for_each_resource(bus, r, i) {

		if (!r)

			continue;