PCI: Convert pcibios_resource_to_bus() to take a pci_bus, not a pci_dev

These interfaces:

  pcibios_resource_to_bus(struct pci_dev *dev, *bus_region, *resource)
  pcibios_bus_to_resource(struct pci_dev *dev, *resource, *bus_region)

took a pci_dev, but they really depend only on the pci_bus.  And we want to
use them in resource allocation paths where we have the bus but not a
device, so this patch converts them to take the pci_bus instead of the
pci_dev:

  pcibios_resource_to_bus(struct pci_bus *bus, *bus_region, *resource)
  pcibios_bus_to_resource(struct pci_bus *bus, *resource, *bus_region)

In fact, with standard PCI-PCI bridges, they only depend on the host
bridge, because that's the only place address translation occurs, but
we aren't going that far yet.

[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 38e403dddf6e..f049e3f53fcc 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -269,8 +269,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 region.end = l + sz;
         }
 
-        pcibios_bus_to_resource(dev, res, &region);
-        pcibios_resource_to_bus(dev, &inverted_region, res);
+        pcibios_bus_to_resource(dev->bus, res, &region);
+        pcibios_resource_to_bus(dev->bus, &inverted_region, res);
 
         /*
          * If "A" is a BAR value (a bus address), "bus_to_resource(A)" is
@@ -364,7 +364,7 @@ static void pci_read_bridge_io(struct pci_bus *child)
                 res->flags = (io_base_lo & PCI_IO_RANGE_TYPE_MASK) | IORESOURCE_IO;
                 region.start = base;
                 region.end = limit + io_granularity - 1;
-                pcibios_bus_to_resource(dev, res, &region);
+                pcibios_bus_to_resource(dev->bus, res, &region);
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
         }
 }
@@ -386,7 +386,7 @@ static void pci_read_bridge_mmio(struct pci_bus *child)
                 res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
                 region.start = base;
                 region.end = limit + 0xfffff;
-                pcibios_bus_to_resource(dev, res, &region);
+                pcibios_bus_to_resource(dev->bus, res, &region);
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
         }
 }
@@ -436,7 +436,7 @@ static void pci_read_bridge_mmio_pref(struct pci_bus *child)
                         res->flags |= IORESOURCE_MEM_64;
                 region.start = base;
                 region.end = limit + 0xfffff;
-                pcibios_bus_to_resource(dev, res, &region);
+                pcibios_bus_to_resource(dev->bus, res, &region);
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
         }
 }
@@ -1084,24 +1084,24 @@ int pci_setup_device(struct pci_dev *dev)
                                 region.end = 0x1F7;
                                 res = &dev->resource[0];
                                 res->flags = LEGACY_IO_RESOURCE;
-                                pcibios_bus_to_resource(dev, res, &region);
+                                pcibios_bus_to_resource(dev->bus, res, &region);
                                 region.start = 0x3F6;
                                 region.end = 0x3F6;
                                 res = &dev->resource[1];
                                 res->flags = LEGACY_IO_RESOURCE;
-                                pcibios_bus_to_resource(dev, res, &region);
+                                pcibios_bus_to_resource(dev->bus, res, &region);
                         }
                         if ((progif & 4) == 0) {
                                 region.start = 0x170;
                                 region.end = 0x177;
                                 res = &dev->resource[2];
                                 res->flags = LEGACY_IO_RESOURCE;
-                                pcibios_bus_to_resource(dev, res, &region);
+                                pcibios_bus_to_resource(dev->bus, res, &region);
                                 region.start = 0x376;
                                 region.end = 0x376;
                                 res = &dev->resource[3];
                                 res->flags = LEGACY_IO_RESOURCE;
-                                pcibios_bus_to_resource(dev, res, &region);
+                                pcibios_bus_to_resource(dev->bus, res, &region);
                         }
                 }
                 break;