xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pmem: switch to devm_ allocations

Browse Source 
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>
This commit is contained in:
Christoph Hellwig
2015-08-10 23:07:08 -04:00
committed by Dan Williams
parent 7d3dcf26a6
commit 708ab62bef
4 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/pmem.h
View File

@@ -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
}