dma-direct: use phys_to_dma_direct in dma_direct_alloc

Replace the currently open code copy.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 12e9f5f75dfe4b942ec53c922db5d765859c000a..57a6e7d7cf8f16210aa9ebe3ed32796877246b18 100644 (file)
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -240,10 +240,7 @@ void *dma_direct_alloc(struct device *dev, size_t size,
                        goto out_encrypt_pages;
        }
 done:
-       if (force_dma_unencrypted(dev))
-               *dma_handle = __phys_to_dma(dev, page_to_phys(page));
-       else
-               *dma_handle = phys_to_dma(dev, page_to_phys(page));
+       *dma_handle = phys_to_dma_direct(dev, page_to_phys(page));
        return ret;
 
 out_encrypt_pages: