summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-03-07 21:51:12 +0100
committerBjorn Helgaas <bhelgaas@google.com>2014-03-19 22:00:16 +0100
commit664c28480c90fb8541bcdd1d4b349e9436165ec7 (patch)
tree6e21ff55e150e7b0e61247407ea985b7ce15a551 /drivers/pci
parentPCI: Check all IORESOURCE_TYPE_BITS in pci_bus_alloc_from_region() (diff)
downloadlinux-664c28480c90fb8541bcdd1d4b349e9436165ec7.tar.xz
linux-664c28480c90fb8541bcdd1d4b349e9436165ec7.zip
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/bus.c4
1 files changed, 2 insertions, 2 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,
static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
resource_size_t size, resource_size_t align,
- resource_size_t min, unsigned int type_mask,
+ resource_size_t min, unsigned long type_mask,
resource_size_t (*alignf)(void *,
const struct resource *,
resource_size_t,
@@ -200,7 +200,7 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
*/
int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
resource_size_t size, resource_size_t align,
- resource_size_t min, unsigned int type_mask,
+ resource_size_t min, unsigned long type_mask,
resource_size_t (*alignf)(void *,
const struct resource *,
resource_size_t,