From: Robin Murphy Date: Mon, 9 Apr 2018 17:59:14 +0000 (+0100) Subject: dma-coherent: clarify dma_mmap_from_dev_coherent documentation X-Git-Tag: v5.15~8960^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41d0bbc749471522714efd0649b7e033fefcbfb4;p=platform%2Fkernel%2Flinux-starfive.git dma-coherent: clarify dma_mmap_from_dev_coherent documentation The use of "correctly mapped" here is misleading, since it can give the wrong expectation in the case that the memory *should* have been mapped from the per-device pool, but doing so failed for other reasons. Signed-off-by: Robin Murphy Signed-off-by: Christoph Hellwig --- diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c index 1e6396b..597d408 100644 --- a/drivers/base/dma-coherent.c +++ b/drivers/base/dma-coherent.c @@ -312,8 +312,9 @@ static int __dma_mmap_from_coherent(struct dma_coherent_mem *mem, * This checks whether the memory was allocated from the per-device * coherent memory pool and if so, maps that memory to the provided vma. * - * Returns 1 if we correctly mapped the memory, or 0 if the caller should - * proceed with mapping memory from generic pools. + * Returns 1 if @vaddr belongs to the device coherent pool and the caller + * should return @ret, or 0 if they should proceed with mapping memory from + * generic areas. */ int dma_mmap_from_dev_coherent(struct device *dev, struct vm_area_struct *vma, void *vaddr, size_t size, int *ret)