Эх сурвалжийг харах

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>
Bjorn Helgaas 11 жил өмнө
parent
commit
664c28480c

+ 2 - 2
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,
 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 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 *,
 		resource_size_t (*alignf)(void *,
 					  const struct resource *,
 					  const struct resource *,
 					  resource_size_t,
 					  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,
 int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
 		resource_size_t size, resource_size_t align,
 		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 *,
 		resource_size_t (*alignf)(void *,
 					  const struct resource *,
 					  const struct resource *,
 					  resource_size_t,
 					  resource_size_t,

+ 1 - 1
include/linux/pci.h

@@ -1066,7 +1066,7 @@ void pci_bus_remove_resources(struct pci_bus *bus);
 int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
 int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
 			struct resource *res, resource_size_t size,
 			struct resource *res, resource_size_t size,
 			resource_size_t align, resource_size_t min,
 			resource_size_t align, resource_size_t min,
-			unsigned int type_mask,
+			unsigned long type_mask,
 			resource_size_t (*alignf)(void *,
 			resource_size_t (*alignf)(void *,
 						  const struct resource *,
 						  const struct resource *,
 						  resource_size_t,
 						  resource_size_t,