diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-01-04 18:50:02 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 15:15:21 -0500 |
commit | fb7ebfe4108e2cdfa2bb88e57148087717463dfa (patch) | |
tree | e18690b45566b6c4df7598524bdbeb71fbd80ba1 /lib/devres.c | |
parent | cda57bf9348fdbf4b8a830d6f9eb7da81df2f486 (diff) |
PCI: Increase resource array mask bit size in pcim_iomap_regions()
DEVICE_COUNT_RESOURCE will be bigger than 16 when SRIOV supported is enabled.
Let them pass with int just like pci_enable_resources().
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'lib/devres.c')
-rw-r--r-- | lib/devres.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |