diff options
| -rw-r--r-- | include/linux/pci.h | 6 | ||||
| -rw-r--r-- | lib/devres.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 5d06e340da9a..a16b1df3deff 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -1432,10 +1432,10 @@ static inline void pci_fixup_device(enum pci_fixup_pass pass, | |||
| 1432 | void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen); | 1432 | void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen); |
| 1433 | void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr); | 1433 | void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr); |
| 1434 | void __iomem * const *pcim_iomap_table(struct pci_dev *pdev); | 1434 | void __iomem * const *pcim_iomap_table(struct pci_dev *pdev); |
| 1435 | int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name); | 1435 | int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name); |
| 1436 | int pcim_iomap_regions_request_all(struct pci_dev *pdev, u16 mask, | 1436 | int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask, |
| 1437 | const char *name); | 1437 | const char *name); |
| 1438 | void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask); | 1438 | void pcim_iounmap_regions(struct pci_dev *pdev, int mask); |
| 1439 | 1439 | ||
| 1440 | extern int pci_pci_problems; | 1440 | extern int pci_pci_problems; |
| 1441 | #define PCIPCI_FAIL 1 /* No PCI PCI DMA */ | 1441 | #define PCIPCI_FAIL 1 /* No PCI PCI DMA */ |
diff --git a/lib/devres.c b/lib/devres.c index 7c0e953a7486..2c851bd903bd 100644 --- a/lib/devres.c +++ b/lib/devres.c | |||
| @@ -253,7 +253,7 @@ EXPORT_SYMBOL(pcim_iounmap); | |||
| 253 | * | 253 | * |
| 254 | * Request and iomap regions specified by @mask. | 254 | * Request and iomap regions specified by @mask. |
| 255 | */ | 255 | */ |
| 256 | int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name) | 256 | int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name) |
| 257 | { | 257 | { |
| 258 | void __iomem * const *iomap; | 258 | void __iomem * const *iomap; |
| 259 | int i, rc; | 259 | int i, rc; |
| @@ -306,7 +306,7 @@ EXPORT_SYMBOL(pcim_iomap_regions); | |||
| 306 | * | 306 | * |
| 307 | * Request all PCI BARs and iomap regions specified by @mask. | 307 | * Request all PCI BARs and iomap regions specified by @mask. |
| 308 | */ | 308 | */ |
| 309 | int pcim_iomap_regions_request_all(struct pci_dev *pdev, u16 mask, | 309 | int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask, |
| 310 | const char *name) | 310 | const char *name) |
| 311 | { | 311 | { |
| 312 | int request_mask = ((1 << 6) - 1) & ~mask; | 312 | int request_mask = ((1 << 6) - 1) & ~mask; |
| @@ -330,7 +330,7 @@ EXPORT_SYMBOL(pcim_iomap_regions_request_all); | |||
| 330 | * | 330 | * |
| 331 | * Unmap and release regions specified by @mask. | 331 | * Unmap and release regions specified by @mask. |
| 332 | */ | 332 | */ |
| 333 | void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask) | 333 | void pcim_iounmap_regions(struct pci_dev *pdev, int mask) |
| 334 | { | 334 | { |
| 335 | void __iomem * const *iomap; | 335 | void __iomem * const *iomap; |
| 336 | int i; | 336 | int i; |
