summaryrefslogtreecommitdiffstats
path: root/drivers/pci/setup-bus.c
diff options
context:
space:
mode:
authorWei Yang <weiyang@linux.vnet.ibm.com>2013-08-02 17:31:05 +0800
committerBjorn Helgaas <bhelgaas@google.com>2013-08-02 16:15:32 -0600
commit11251a869e84b2a3224955fe149dd33a16805cbf (patch)
treeb59499a37f9470c0ea7fa8b207a699a50f4897bb /drivers/pci/setup-bus.c
parent496f70cf6507be96397d319b1b7d3946d51d9932 (diff)
downloadlinux-stable-11251a869e84b2a3224955fe149dd33a16805cbf.tar.gz
linux-stable-11251a869e84b2a3224955fe149dd33a16805cbf.tar.bz2
linux-stable-11251a869e84b2a3224955fe149dd33a16805cbf.zip
PCI: Fix types in pbus_size_io()
This patch changes the type of "size" to resource_size_t and makes the corresponding dev_printk() change. [bhelgaas: changelog] Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r--drivers/pci/setup-bus.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 939ca1b9af92..d4f1ad956fad 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -747,7 +747,7 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
{
struct pci_dev *dev;
struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);
- unsigned long size = 0, size0 = 0, size1 = 0;
+ resource_size_t size = 0, size0 = 0, size1 = 0;
resource_size_t children_add_size = 0;
resource_size_t min_align, io_align, align;
@@ -807,8 +807,9 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
add_to_list(realloc_head, bus->self, b_res, size1-size0,
min_align);
dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window "
- "%pR to %pR add_size %lx\n", b_res,
- &bus->busn_res, size1-size0);
+ "%pR to %pR add_size %llx\n", b_res,
+ &bus->busn_res,
+ (unsigned long long)size1-size0);
}
}