summaryrefslogtreecommitdiff
path: root/include/linux/pmem.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-08-10 23:07:08 -0400
committerDan Williams <dan.j.williams@intel.com>2015-08-14 16:01:21 -0400
commit708ab62bef1ed3a3cf065a4138bd87f5d083cfeb (patch)
tree542b8ff5e95aa176e0738736a25721b589949882 /include/linux/pmem.h
parent7d3dcf26a6559fa82af3f53e2c8b163cec95fdaf (diff)
pmem: switch to devm_ allocations
Signed-off-by: Christoph Hellwig <hch@lst.de> [djbw: tools/testing/nvdimm/ and memunmap_pmem support] Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'include/linux/pmem.h')
-rw-r--r--include/linux/pmem.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/pmem.h b/include/linux/pmem.h
index 093c35ecefcc..20c367cd76e6 100644
--- a/include/linux/pmem.h
+++ b/include/linux/pmem.h
@@ -46,9 +46,9 @@ static inline void memcpy_from_pmem(void *dst, void __pmem const *src, size_t si
memcpy(dst, (void __force const *) src, size);
}
-static inline void memunmap_pmem(void __pmem *addr)
+static inline void memunmap_pmem(struct device *dev, void __pmem *addr)
{
- memunmap((void __force *) addr);
+ devm_memunmap(dev, (void __force *) addr);
}
/**
@@ -97,13 +97,15 @@ static inline void default_memcpy_to_pmem(void __pmem *dst, const void *src,
* wmb_pmem() arrange for the data to be written through the
* cache to persistent media.
*/
-static inline void __pmem *memremap_pmem(resource_size_t offset,
- unsigned long size)
+static inline void __pmem *memremap_pmem(struct device *dev,
+ resource_size_t offset, unsigned long size)
{
#ifdef ARCH_MEMREMAP_PMEM
- return (void __pmem *) memremap(offset, size, ARCH_MEMREMAP_PMEM);
+ return (void __pmem *) devm_memremap(dev, offset, size,
+ ARCH_MEMREMAP_PMEM);
#else
- return (void __pmem *) memremap(offset, size, MEMREMAP_WT);
+ return (void __pmem *) devm_memremap(dev, offset, size,
+ MEMREMAP_WT);
#endif
}