aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-03-07 15:51:12 -0500
committerBjorn Helgaas <bhelgaas@google.com>2014-03-19 17:00:16 -0400
commit664c28480c90fb8541bcdd1d4b349e9436165ec7 (patch)
tree6e21ff55e150e7b0e61247407ea985b7ce15a551
parentaa11fc58dc71c27701b1f9a529a36a38d4337722 (diff)
PCI: Change pci_bus_alloc_resource() type_mask to unsigned long
The pci_bus_alloc_resource() "type_mask" parameter is used to compare with the "flags" member of a struct resource, so it should be the same type, namely "unsigned long". No functional change because all current IORESOURCE_* flags fit in 32 bits. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/bus.c4
-rw-r--r--include/linux/pci.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index e3bdc88668ec..fb8aed307c28 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -132,7 +132,7 @@ static void pci_clip_resource_to_region(struct pci_bus *bus,
132 132
133static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, 133static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
134 resource_size_t size, resource_size_t align, 134 resource_size_t size, resource_size_t align,
135 resource_size_t min, unsigned int type_mask, 135 resource_size_t min, unsigned long type_mask,
136 resource_size_t (*alignf)(void *, 136 resource_size_t (*alignf)(void *,
137 const struct resource *, 137 const struct resource *,
138 resource_size_t, 138 resource_size_t,
@@ -200,7 +200,7 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
200 */ 200 */
201int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, 201int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
202 resource_size_t size, resource_size_t align, 202 resource_size_t size, resource_size_t align,
203 resource_size_t min, unsigned int type_mask, 203 resource_size_t min, unsigned long type_mask,
204 resource_size_t (*alignf)(void *, 204 resource_size_t (*alignf)(void *,
205 const struct resource *, 205 const struct resource *,
206 resource_size_t, 206 resource_size_t,
diff --git a/include/linux/pci.h b/include/linux/pci.h
index fb57c892b214..60ebc17fe909 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1066,7 +1066,7 @@ void pci_bus_remove_resources(struct pci_bus *bus);
1066int __must_check pci_bus_alloc_resource(struct pci_bus *bus, 1066int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
1067 struct resource *res, resource_size_t size, 1067 struct resource *res, resource_size_t size,
1068 resource_size_t align, resource_size_t min, 1068 resource_size_t align, resource_size_t min,
1069 unsigned int type_mask, 1069 unsigned long type_mask,
1070 resource_size_t (*alignf)(void *, 1070 resource_size_t (*alignf)(void *,
1071 const struct resource *, 1071 const struct resource *,
1072 resource_size_t, 1072 resource_size_t,