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

commit fc2798502f860b18f3c7121e4dc659d3d9d28d74 upstream.

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>
Cc: Dirk Behme <dirk.behme@gmail.com>
[lizf: Backported to 3.4:
 - make changes to pci_host_bridge() instead of find_pci_root_bus()
 - adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>

diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c
index 53649c7d0068f19e4b66b7cf8a6012ad5519f7b3..1a333558f656dc4cf33733b2958b7caf4fb92d6b 100644 (file)
--- a/arch/alpha/kernel/pci-sysfs.c
+++ b/arch/alpha/kernel/pci-sysfs.c
@@ -84,7 +84,7 @@ static int pci_mmap_resource(struct kobject *kobj,
        if (iomem_is_exclusive(res->start))
                return -EINVAL;
 
-       pcibios_resource_to_bus(pdev, &bar, res);
+       pcibios_resource_to_bus(pdev->bus, &bar, res);
        vma->vm_pgoff += bar.start >> (PAGE_SHIFT - (sparse ? 5 : 0));
        mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io;
 
@@ -140,7 +140,7 @@ static int sparse_mem_mmap_fits(struct pci_dev *pdev, int num)
        long dense_offset;
        unsigned long sparse_size;
 
-       pcibios_resource_to_bus(pdev, &bar, &pdev->resource[num]);
+       pcibios_resource_to_bus(pdev->bus, &bar, &pdev->resource[num]);
 
        /* All core logic chips have 4G sparse address space, except
           CIA which has 16G (see xxx_SPARSE_MEM and xxx_DENSE_MEM

diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 89dde171a6fabfafc23d1e29f3cba0bf00350bbe..55551a823bd3464f9ba525ca479114b1475ffe92 100644 (file)
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -111,7 +111,7 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev)
                res->name = pci_name(dev);
                region.start = base;
                region.end = base + size - 1;
-               pcibios_bus_to_resource(dev, res, &region);
+               pcibios_bus_to_resource(dev->bus, res, &region);
        }
 }
 
@@ -276,7 +276,7 @@ void __devinit of_scan_pci_bridge(struct pci_dev *dev)
                res->flags = flags;
                region.start = of_read_number(&ranges[1], 2);
                region.end = region.start + size - 1;
-               pcibios_bus_to_resource(dev, res, &region);
+               pcibios_bus_to_resource(dev->bus, res, &region);
        }
        sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
                bus->number);

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 5da8e8df592284732819421f263c55e0830012b7..79a17f798ef85e4141da88c17c7cd5aeba67dae1 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -392,7 +392,7 @@ static void __devinit pnv_ioda_setup_pe_segments(struct pci_dev *dev)
 
        /* Setup IO segments */
        if (io_res.start < io_res.end) {
-               pcibios_resource_to_bus(dev, &region, &io_res);
+               pcibios_resource_to_bus(dev->bus, &region, &io_res);
                pos = region.start;
                i = pos / phb->ioda.io_segsize;
                while(i < phb->ioda.total_pe && pos <= region.end) {
@@ -422,7 +422,7 @@ static void __devinit pnv_ioda_setup_pe_segments(struct pci_dev *dev)
 
        /* Setup M32 segments */
        if (m32_res.start < m32_res.end) {
-               pcibios_resource_to_bus(dev, &region, &m32_res);
+               pcibios_resource_to_bus(dev->bus, &region, &m32_res);
                pos = region.start;
                i = pos / phb->ioda.m32_segsize;
                while(i < phb->ioda.total_pe && pos <= region.end) {

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 8c5c9a5675b4367868895b3bf695c223261e9eb4..ab5f471aa6e95f104e138d9a801a3a52a4644cc4 100644 (file)
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -409,7 +409,7 @@ static void __devinit pci_cfg_fake_ranges(struct pci_dev *dev,
                res2.flags = res->flags;
                region.start = base;
                region.end = limit + 0xfff;
-               pcibios_bus_to_resource(dev, &res2, &region);
+               pcibios_bus_to_resource(dev->bus, &res2, &region);
                if (!res->start)
                        res->start = res2.start;
                if (!res->end)
@@ -427,7 +427,7 @@ static void __devinit pci_cfg_fake_ranges(struct pci_dev *dev,
                              IORESOURCE_MEM);
                region.start = base;
                region.end = limit + 0xfffff;
-               pcibios_bus_to_resource(dev, res, &region);
+               pcibios_bus_to_resource(dev->bus, res, &region);
        }
 
        pci_read_config_word(dev, PCI_PREF_MEMORY_BASE, &mem_base_lo);
@@ -458,7 +458,7 @@ static void __devinit pci_cfg_fake_ranges(struct pci_dev *dev,
                              IORESOURCE_MEM | IORESOURCE_PREFETCH);
                region.start = base;
                region.end = limit + 0xfffff;
-               pcibios_bus_to_resource(dev, res, &region);
+               pcibios_bus_to_resource(dev->bus, res, &region);
        }
 }
 
@@ -480,7 +480,7 @@ static void __devinit apb_fake_ranges(struct pci_dev *dev,
        res->flags = IORESOURCE_IO;
        region.start = (first << 21);
        region.end = (last << 21) + ((1 << 21) - 1);
-       pcibios_bus_to_resource(dev, res, &region);
+       pcibios_bus_to_resource(dev->bus, res, &region);
 
        pci_read_config_byte(dev, APB_MEM_ADDRESS_MAP, &map);
        apb_calc_first_last(map, &first, &last);
@@ -488,7 +488,7 @@ static void __devinit apb_fake_ranges(struct pci_dev *dev,
        res->flags = IORESOURCE_MEM;
        region.start = (first << 29);
        region.end = (last << 29) + ((1 << 29) - 1);
-       pcibios_bus_to_resource(dev, res, &region);
+       pcibios_bus_to_resource(dev->bus, res, &region);
 }
 
 static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
@@ -579,7 +579,7 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
                res->flags = flags;
                region.start = GET_64BIT(ranges, 1);
                region.end = region.start + size - 1;
-               pcibios_bus_to_resource(dev, res, &region);
+               pcibios_bus_to_resource(dev->bus, res, &region);
        }
 after_ranges:
        sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index d62ad0b1516d526f51de25cdb216e7822445769d..868440f83939542104616d28ba52efa325e9237c 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -44,12 +44,10 @@ int no_pci_devices(void)
 }
 EXPORT_SYMBOL(no_pci_devices);
 
-static struct pci_host_bridge *pci_host_bridge(struct pci_dev *dev)
+static struct pci_host_bridge *pci_host_bridge(struct pci_bus *bus)
 {
-       struct pci_bus *bus;
        struct pci_host_bridge *bridge;
 
-       bus = dev->bus;
        while (bus->parent)
                bus = bus->parent;
 
@@ -66,10 +64,10 @@ static bool resource_contains(struct resource *res1, struct resource *res2)
        return res1->start <= res2->start && res1->end >= res2->end;
 }
 
-void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
+void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,
                             struct resource *res)
 {
-       struct pci_host_bridge *bridge = pci_host_bridge(dev);
+       struct pci_host_bridge *bridge = pci_host_bridge(bus);
        struct pci_host_bridge_window *window;
        resource_size_t offset = 0;
 
@@ -94,10 +92,10 @@ static bool region_contains(struct pci_bus_region *region1,
        return region1->start <= region2->start && region1->end >= region2->end;
 }
 
-void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
+void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
                             struct pci_bus_region *region)
 {
-       struct pci_host_bridge *bridge = pci_host_bridge(dev);
+       struct pci_host_bridge *bridge = pci_host_bridge(bus);
        struct pci_host_bridge_window *window;
        struct pci_bus_region bus_region;
        resource_size_t offset = 0;
@@ -298,11 +296,11 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                        pci_write_config_dword(dev, pos + 4, 0);
                        region.start = 0;
                        region.end = sz64;
-                       pcibios_bus_to_resource(dev, res, &region);
+                       pcibios_bus_to_resource(dev->bus, res, &region);
                } else {
                        region.start = l64;
                        region.end = l64 + sz64;
-                       pcibios_bus_to_resource(dev, res, &region);
+                       pcibios_bus_to_resource(dev->bus, res, &region);
                        dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n",
                                   pos, res);
                }
@@ -314,7 +312,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
 
                region.start = l;
                region.end = l + sz;
-               pcibios_bus_to_resource(dev, res, &region);
+               pcibios_bus_to_resource(dev->bus, res, &region);
 
                dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res);
        }
@@ -373,7 +371,7 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child)
                res2.flags = res->flags;
                region.start = base;
                region.end = limit + 0xfff;
-               pcibios_bus_to_resource(dev, &res2, &region);
+               pcibios_bus_to_resource(dev->bus, &res2, &region);
                if (!res->start)
                        res->start = res2.start;
                if (!res->end)
@@ -399,7 +397,7 @@ static void __devinit 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);
        }
 }
@@ -448,7 +446,7 @@ static void __devinit 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);
        }
 }
@@ -1063,24 +1061,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;

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index ffde183ac1b3aed5dacdda8f727b29c4a9b24e1a..c0300242db86161efffef9dc9902abe30f4a7311 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -393,7 +393,7 @@ static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region,
                /* Convert from PCI bus to resource space.  */
                bus_region.start = res->start;
                bus_region.end = res->end;
-               pcibios_bus_to_resource(dev, res, &bus_region);
+               pcibios_bus_to_resource(dev->bus, res, &bus_region);
 
                if (pci_claim_resource(dev, nr) == 0)
                        dev_info(&dev->dev, "quirk: %pR claimed by %s\n",

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index e31659ce91eb88b2695afdccc866fe1bb3b0ee50..336b999a716d2e1a54e3837529bdbac2c45b5efa 100644 (file)
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -31,7 +31,7 @@ int pci_enable_rom(struct pci_dev *pdev)
        if (!res->flags)
                return -1;
 
-       pcibios_resource_to_bus(pdev, &region, res);
+       pcibios_resource_to_bus(pdev->bus, &region, res);
        pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr);
        rom_addr &= ~PCI_ROM_ADDRESS_MASK;
        rom_addr |= region.start | PCI_ROM_ADDRESS_ENABLE;

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 8fa2d4be88dea9d90e7aa93bab89e60d1e30b7bf..244ada4113695198c7947583e7ad7313575a2856 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -408,7 +408,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
                 bus->secondary, bus->subordinate);
 
        res = bus->resource[0];
-       pcibios_resource_to_bus(bridge, &region, res);
+       pcibios_resource_to_bus(bridge->bus, &region, res);
        if (res->flags & IORESOURCE_IO) {
                /*
                 * The IO resource is allocated a range twice as large as it
@@ -422,7 +422,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
        }
 
        res = bus->resource[1];
-       pcibios_resource_to_bus(bridge, &region, res);
+       pcibios_resource_to_bus(bridge->bus, &region, res);
        if (res->flags & IORESOURCE_IO) {
                dev_info(&bridge->dev, "  bridge window %pR\n", res);
                pci_write_config_dword(bridge, PCI_CB_IO_BASE_1,
@@ -432,7 +432,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
        }
 
        res = bus->resource[2];
-       pcibios_resource_to_bus(bridge, &region, res);
+       pcibios_resource_to_bus(bridge->bus, &region, res);
        if (res->flags & IORESOURCE_MEM) {
                dev_info(&bridge->dev, "  bridge window %pR\n", res);
                pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_0,
@@ -442,7 +442,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
        }
 
        res = bus->resource[3];
-       pcibios_resource_to_bus(bridge, &region, res);
+       pcibios_resource_to_bus(bridge->bus, &region, res);
        if (res->flags & IORESOURCE_MEM) {
                dev_info(&bridge->dev, "  bridge window %pR\n", res);
                pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_1,
@@ -473,7 +473,7 @@ static void pci_setup_bridge_io(struct pci_bus *bus)
 
        /* Set up the top and bottom of the PCI I/O segment for this bus. */
        res = bus->resource[0];
-       pcibios_resource_to_bus(bridge, &region, res);
+       pcibios_resource_to_bus(bridge->bus, &region, res);
        if (res->flags & IORESOURCE_IO) {
                pci_read_config_dword(bridge, PCI_IO_BASE, &l);
                l &= 0xffff0000;
@@ -504,7 +504,7 @@ static void pci_setup_bridge_mmio(struct pci_bus *bus)
 
        /* Set up the top and bottom of the PCI Memory segment for this bus. */
        res = bus->resource[1];
-       pcibios_resource_to_bus(bridge, &region, res);
+       pcibios_resource_to_bus(bridge->bus, &region, res);
        if (res->flags & IORESOURCE_MEM) {
                l = (region.start >> 16) & 0xfff0;
                l |= region.end & 0xfff00000;
@@ -530,7 +530,7 @@ static void pci_setup_bridge_mmio_pref(struct pci_bus *bus)
        /* Set up PREF base/limit. */
        bu = lu = 0;
        res = bus->resource[2];
-       pcibios_resource_to_bus(bridge, &region, res);
+       pcibios_resource_to_bus(bridge->bus, &region, res);
        if (res->flags & IORESOURCE_PREFETCH) {
                l = (region.start >> 16) & 0xfff0;
                l |= region.end & 0xfff00000;

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index be76ebacf4864291b31f4a7fdf1504a0c3e1190b..d427277e43ecb846d23d168bb0409759c414841f 100644 (file)
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -50,7 +50,7 @@ void pci_update_resource(struct pci_dev *dev, int resno)
        if (res->flags & IORESOURCE_PCI_FIXED)
                return;
 
-       pcibios_resource_to_bus(dev, &region, res);
+       pcibios_resource_to_bus(dev->bus, &region, res);
 
        new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
        if (res->flags & IORESOURCE_IO)

diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 4e8831bdb6efb2af19e4a25114cbc80daabc3bb7..099034b39812fcd4b7b89c463f0b4592d54908cf 100644 (file)
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -610,7 +610,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 d07f9ac8c41ddb550688a4b2b3c3fc4dcbf295be..13e76f9bdbcff328df6f54adec0936eab244f168 100644 (file)
--- 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);

diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 36d1ed7817ebf9d52631c970023d31b31ff494e0..1e3d7891b72caf8e0c07c5a7052b54ac05bbe835 100644 (file)
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -1609,7 +1609,7 @@ sym_iomap_device(struct sym_device *device)
        struct pci_bus_region bus_addr;
        int i = 2;
 
-       pcibios_resource_to_bus(pdev, &bus_addr, &pdev->resource[1]);
+       pcibios_resource_to_bus(pdev->bus, &bus_addr, &pdev->resource[1]);
        device->mmio_base = bus_addr.start;
 
        if (device->chip.features & FE_RAM) {
@@ -1619,7 +1619,8 @@ sym_iomap_device(struct sym_device *device)
                 */
                if (!pdev->resource[i].flags)
                        i++;
-               pcibios_resource_to_bus(pdev, &bus_addr, &pdev->resource[i]);
+               pcibios_resource_to_bus(pdev->bus, &bus_addr,
+                                       &pdev->resource[i]);
                device->ram_base = bus_addr.start;
        }
 

diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 555dd4c64f5be24a1a13986f84fe19360f1d9102..65196fe348e4638534ff30331e33ed280f05d495 100644 (file)
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -1014,7 +1014,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
 
        vga_res.flags = IORESOURCE_IO;
 
-       pcibios_bus_to_resource(dev, &vga_res, &bus_reg);
+       pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
 
        par->state.vgabase = (void __iomem *) vga_res.start;
 

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 2c80246b18b88eee0b22a90c8fbc5581c02aad96..7b7af8c8706de15469e4063a492d8fca9fc935a9 100644 (file)
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -1172,7 +1172,7 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
 
        vga_res.flags = IORESOURCE_IO;
 
-       pcibios_bus_to_resource(dev, &vga_res, &bus_reg);
+       pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
 
        par->state.vgabase = (void __iomem *) vga_res.start;
 

diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 4e74d262cf3e9f338c1eb0cb46a5835794a532d3..dfecf02fad37e5ec06f8694fed32773f4bfa4ea9 100644 (file)
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -727,7 +727,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
 
        vga_res.flags = IORESOURCE_IO;
 
-       pcibios_bus_to_resource(dev, &vga_res, &bus_reg);
+       pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
 
        par->state.vgabase = (void __iomem *) vga_res.start;
 

diff --git a/include/linux/pci.h b/include/linux/pci.h
index e444f5b491188566b8a7107182fd24584d92fea2..469c9536c5e5f6c6eb3d0eafbd3fafe51462e017 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -648,9 +648,9 @@ void pci_fixup_cardbus(struct pci_bus *);
 
 /* Generic PCI functions used internally */
 
-void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
+void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,
                             struct resource *res);
-void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
+void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
                             struct pci_bus_region *region);
 void pcibios_scan_specific_bus(int busn);
 extern struct pci_bus *pci_find_bus(int domain, int busnr);