aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWei Yang <weiyang@linux.vnet.ibm.com>2013-08-02 05:31:05 -0400
committerBjorn Helgaas <bhelgaas@google.com>2013-08-02 18:15:32 -0400
commit11251a869e84b2a3224955fe149dd33a16805cbf (patch)
treeb59499a37f9470c0ea7fa8b207a699a50f4897bb /drivers
parent496f70cf6507be96397d319b1b7d3946d51d9932 (diff)
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')
-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,
747{ 747{
748 struct pci_dev *dev; 748 struct pci_dev *dev;
749 struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO); 749 struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);
750 unsigned long size = 0, size0 = 0, size1 = 0; 750 resource_size_t size = 0, size0 = 0, size1 = 0;
751 resource_size_t children_add_size = 0; 751 resource_size_t children_add_size = 0;
752 resource_size_t min_align, io_align, align; 752 resource_size_t min_align, io_align, align;
753 753
@@ -807,8 +807,9 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
807 add_to_list(realloc_head, bus->self, b_res, size1-size0, 807 add_to_list(realloc_head, bus->self, b_res, size1-size0,
808 min_align); 808 min_align);
809 dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " 809 dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window "
810 "%pR to %pR add_size %lx\n", b_res, 810 "%pR to %pR add_size %llx\n", b_res,
811 &bus->busn_res, size1-size0); 811 &bus->busn_res,
812 (unsigned long long)size1-size0);
812 } 813 }
813} 814}
814 815