aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-11 21:50:26 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-11 21:50:26 -0500
commit7b67e751479d50b7f84d1a3cc5216eed5e534b66 (patch)
treea1a6746857cf65f04dde739fe271bf4143d55eaf /lib
parent9f13a1fd452f11c18004ba2422a6384b424ec8a9 (diff)
parent76ccc297018d25d55b789bbd508861ef1e2cdb0c (diff)
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits) x86/PCI: Expand the x86_msi_ops to have a restore MSIs. PCI: Increase resource array mask bit size in pcim_iomap_regions() PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT) PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB x86/PCI: amd: factor out MMCONFIG discovery PCI: Enable ATS at the device state restore PCI: msi: fix imbalanced refcount of msi irq sysfs objects PCI: kconfig: English typo in pci/pcie/Kconfig PCI/PM/Runtime: make PCI traces quieter PCI: remove pci_create_bus() xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus() x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented() x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources sparc/PCI: convert to pci_create_root_bus() sh/PCI: convert to pci_scan_root_bus() for correct root bus resources powerpc/PCI: convert to pci_create_root_bus() powerpc/PCI: split PHB part out of pcibios_map_io_space() ... Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due to the same patches being applied in other branches.
Diffstat (limited to 'lib')
-rw-r--r--lib/devres.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/devres.c b/lib/devres.c
index 4fbc09e6e9e6..9676617b4486 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -304,7 +304,7 @@ EXPORT_SYMBOL(pcim_iounmap);
304 * 304 *
305 * Request and iomap regions specified by @mask. 305 * Request and iomap regions specified by @mask.
306 */ 306 */
307int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name) 307int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name)
308{ 308{
309 void __iomem * const *iomap; 309 void __iomem * const *iomap;
310 int i, rc; 310 int i, rc;
@@ -357,7 +357,7 @@ EXPORT_SYMBOL(pcim_iomap_regions);
357 * 357 *
358 * Request all PCI BARs and iomap regions specified by @mask. 358 * Request all PCI BARs and iomap regions specified by @mask.
359 */ 359 */
360int pcim_iomap_regions_request_all(struct pci_dev *pdev, u16 mask, 360int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask,
361 const char *name) 361 const char *name)
362{ 362{
363 int request_mask = ((1 << 6) - 1) & ~mask; 363 int request_mask = ((1 << 6) - 1) & ~mask;
@@ -381,7 +381,7 @@ EXPORT_SYMBOL(pcim_iomap_regions_request_all);
381 * 381 *
382 * Unmap and release regions specified by @mask. 382 * Unmap and release regions specified by @mask.
383 */ 383 */
384void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask) 384void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
385{ 385{
386 void __iomem * const *iomap; 386 void __iomem * const *iomap;
387 int i; 387 int i;