From: Christoph Hellwig Date: Wed, 7 Aug 2019 10:55:01 +0000 (+0300) Subject: arm-nommu: call dma_mmap_from_dev_coherent directly X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=07d841a625bc5faee167adc296d04cbca7779703;p=linux.git arm-nommu: call dma_mmap_from_dev_coherent directly There is no need to go through dma_common_mmap for the arm-nommu dma mmap implementation as the only possible memory not handled above could be that from the per-device coherent pool. Signed-off-by: Christoph Hellwig --- diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c index 52b82559d99b3..db92478983005 100644 --- a/arch/arm/mm/dma-mapping-nommu.c +++ b/arch/arm/mm/dma-mapping-nommu.c @@ -68,8 +68,9 @@ static int arm_nommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, if (dma_mmap_from_global_coherent(vma, cpu_addr, size, &ret)) return ret; - - return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size, attrs); + if (dma_mmap_from_dev_coherent(dev, vma, cpu_addr, size, &ret)) + return ret; + return -ENXIO; }