PCI: Make pci_bus_for_each_resource() index optional

[sfrench/cifs-2.6.git] / drivers / pci / bus.c

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 83ae838ceb5f0a3ea93750ea51568eb83bd91764..f37f23574ad8115ac185d7b63a231aea4bdc1994 100644 (file)
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -161,13 +161,13 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
                void *alignf_data,
                struct pci_bus_region *region)
 {
-       int i, ret;
        struct resource *r, avail;
        resource_size_t max;
+       int ret;
 
        type_mask |= IORESOURCE_TYPE_BITS;
 
-       pci_bus_for_each_resource(bus, r, i) {
+       pci_bus_for_each_resource(bus, r) {
                resource_size_t min_used = min;
 
                if (!r)
@@ -268,9 +268,8 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx)
        struct resource *res = &dev->resource[idx];
        struct resource orig_res = *res;
        struct resource *r;
-       int i;
 
-       pci_bus_for_each_resource(bus, r, i) {
+       pci_bus_for_each_resource(bus, r) {
                resource_size_t start, end;
 
                if (!r)