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>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 519c4d6003a6..7d47456429a1 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -608,7 +608,7 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
         
         enter("i82092aa_set_mem_map");
 
-        pcibios_resource_to_bus(sock_info->dev, &region, mem->res);
+        pcibios_resource_to_bus(sock_info->dev->bus, &region, mem->res);
         
         map = mem->map;
         if (map > 4) {
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index dc18a3a5e010..8485761e76af 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -445,7 +445,7 @@ static int yenta_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *
         unsigned int start, stop, card_start;
         unsigned short word;
 
-        pcibios_resource_to_bus(socket->dev, &region, mem->res);
+        pcibios_resource_to_bus(socket->dev->bus, &region, mem->res);
 
         map = mem->map;
         start = region.start;
@@ -709,7 +709,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type
         region.start = config_readl(socket, addr_start) & mask;
         region.end = config_readl(socket, addr_end) | ~mask;
         if (region.start && region.end > region.start && !override_bios) {
-                pcibios_bus_to_resource(dev, res, &region);
+                pcibios_bus_to_resource(dev->bus, res, &region);
                 if (pci_claim_resource(dev, PCI_BRIDGE_RESOURCES + nr) == 0)
                         return 0;
                 dev_printk(KERN_INFO, &dev->dev,
@@ -1033,7 +1033,7 @@ static void yenta_config_init(struct yenta_socket *socket)
         struct pci_dev *dev = socket->dev;
         struct pci_bus_region region;
 
-        pcibios_resource_to_bus(socket->dev, &region, &dev->resource[0]);
+        pcibios_resource_to_bus(socket->dev->bus, &region, &dev->resource[0]);
 
         config_writel(socket, CB_LEGACY_MODE_BASE, 0);
         config_writel(socket, PCI_BASE_ADDRESS_0, region.start);