diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-08-27 19:40:26 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-08-27 19:40:26 -0400 |
| commit | 4a9bf88a5caa8495b5eb2b738d5fb40924bbc538 (patch) | |
| tree | 7c2901cb67a7dd7c863fee6924afe24be79cddab /lib/pci_iomap.c | |
| parent | a06a7576526e10a99ea7721533e7f2df3e26baad (diff) | |
| parent | 67a3e8fe90156d41cd480d3dfbb40f3bc007c262 (diff) | |
Merge branch 'pmem-api' into libnvdimm-for-next
Diffstat (limited to 'lib/pci_iomap.c')
| -rw-r--r-- | lib/pci_iomap.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c index bcce5f149310..e1930dbab2da 100644 --- a/lib/pci_iomap.c +++ b/lib/pci_iomap.c @@ -41,11 +41,8 @@ void __iomem *pci_iomap_range(struct pci_dev *dev, len = maxlen; if (flags & IORESOURCE_IO) return __pci_ioport_map(dev, start, len); - if (flags & IORESOURCE_MEM) { - if (flags & IORESOURCE_CACHEABLE) - return ioremap(start, len); - return ioremap_nocache(start, len); - } + if (flags & IORESOURCE_MEM) + return ioremap(start, len); /* What? */ return NULL; } |