]> Pileus Git - ~andy/linux/commitdiff
PCI: Fix types in pbus_size_io()
authorWei Yang <weiyang@linux.vnet.ibm.com>
Fri, 2 Aug 2013 09:31:05 +0000 (17:31 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 2 Aug 2013 22:15:32 +0000 (16:15 -0600)
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>
drivers/pci/setup-bus.c

index 939ca1b9af9274418e1bb2e252446b4e94c6d56a..d4f1ad956fadbf82885d93d610b32744fdddb895 100644 (file)
@@ -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);
        }
 }