diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-12-14 09:15:02 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-12-20 08:14:09 +0100 |
| commit | 06d4dd2f2ce1cdb625f77c0676d5af6ba310c01d (patch) | |
| tree | 4ab5304877a59cda6d57944619e7567af45ae2b6 | |
| parent | 518a2f1925c3165befbf06b75e07636549d92c1c (diff) | |
| download | linux-06d4dd2f2ce1cdb625f77c0676d5af6ba310c01d.tar.gz linux-06d4dd2f2ce1cdb625f77c0676d5af6ba310c01d.tar.bz2 linux-06d4dd2f2ce1cdb625f77c0676d5af6ba310c01d.zip | |
dma-mapping: deprecate dma_zalloc_coherent
We now always return zeroed memory from dma_alloc_coherent. Note that
simply passing GFP_ZERO to dma_alloc_coherent wasn't always doing the
right thing to start with given that various allocators are not backed
by the page allocator and thus would ignore GFP_ZERO.
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | Documentation/DMA-API.txt | 9 | ||||
| -rw-r--r-- | include/linux/dma-mapping.h | 7 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index 016eb6909b8a..e133ccd60228 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt @@ -60,15 +60,6 @@ the returned memory, like GFP_DMA). :: - void * - dma_zalloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, gfp_t flag) - -Wraps dma_alloc_coherent() and also zeroes the returned memory if the -allocation attempt succeeded. - -:: - void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index f422aec0f53c..a52c6409bdc2 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -644,12 +644,13 @@ static inline unsigned long dma_max_pfn(struct device *dev) } #endif +/* + * Please always use dma_alloc_coherent instead as it already zeroes the memory! + */ static inline void *dma_zalloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { - void *ret = dma_alloc_coherent(dev, size, dma_handle, - flag | __GFP_ZERO); - return ret; + return dma_alloc_coherent(dev, size, dma_handle, flag); } static inline int dma_get_cache_alignment(void) |