aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/mm
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-05-21 12:21:50 +0200
committerChristoph Hellwig <hch@lst.de>2017-06-20 11:13:08 +0200
commite0d60ac10ec01647bbdd3963831515dde17f2d70 (patch)
tree2c9eb32852a9c1059f249bf9dd780166779480a0 /arch/arm64/mm
parentxtensa: remove DMA_ERROR_CODE (diff)
downloadlinux-dev-e0d60ac10ec01647bbdd3963831515dde17f2d70.tar.xz
linux-dev-e0d60ac10ec01647bbdd3963831515dde17f2d70.zip
arm64: remove DMA_ERROR_CODE
The dma alloc interface returns an error by return NULL, and the mapping interfaces rely on the mapping_error method, which the dummy ops already implement correctly. Thus remove the DMA_ERROR_CODE define. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r--arch/arm64/mm/dma-mapping.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 3216e098c058..147fbb907a2f 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -184,7 +184,6 @@ static void *__dma_alloc(struct device *dev, size_t size,
no_map:
__dma_free_coherent(dev, size, ptr, *dma_handle, attrs);
no_mem:
- *dma_handle = DMA_ERROR_CODE;
return NULL;
}
@@ -487,7 +486,7 @@ static dma_addr_t __dummy_map_page(struct device *dev, struct page *page,
enum dma_data_direction dir,
unsigned long attrs)
{
- return DMA_ERROR_CODE;
+ return 0;
}
static void __dummy_unmap_page(struct device *dev, dma_addr_t dev_addr,