1 files changed, 8 insertions, 15 deletions

diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index d1b04753b204..60c7e9e9901e 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -32,8 +32,6 @@
 #include <linux/scatterlist.h>
 #include <linux/vmalloc.h>
 
-#define IOMMU_MAPPING_ERROR     0
-
 struct iommu_dma_msi_page {
         struct list_head        list;
         dma_addr_t              iova;
@@ -523,7 +521,7 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size,
 {
         __iommu_dma_unmap(iommu_get_dma_domain(dev), *handle, size);
         __iommu_dma_free_pages(pages, PAGE_ALIGN(size) >> PAGE_SHIFT);
-        *handle = IOMMU_MAPPING_ERROR;
+        *handle = DMA_MAPPING_ERROR;
 }
 
 /**
@@ -556,7 +554,7 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
         dma_addr_t iova;
         unsigned int count, min_size, alloc_sizes = domain->pgsize_bitmap;
 
-        *handle = IOMMU_MAPPING_ERROR;
+        *handle = DMA_MAPPING_ERROR;
 
         min_size = alloc_sizes & -alloc_sizes;
         if (min_size < PAGE_SIZE) {
@@ -649,11 +647,11 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,
 
         iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev);
         if (!iova)
-                return IOMMU_MAPPING_ERROR;
+                return DMA_MAPPING_ERROR;
 
         if (iommu_map(domain, iova, phys - iova_off, size, prot)) {
                 iommu_dma_free_iova(cookie, iova, size);
-                return IOMMU_MAPPING_ERROR;
+                return DMA_MAPPING_ERROR;
         }
         return iova + iova_off;
 }
@@ -694,7 +692,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents,
 
                 s->offset += s_iova_off;
                 s->length = s_length;
-                sg_dma_address(s) = IOMMU_MAPPING_ERROR;
+                sg_dma_address(s) = DMA_MAPPING_ERROR;
                 sg_dma_len(s) = 0;
 
                 /*
@@ -737,11 +735,11 @@ static void __invalidate_sg(struct scatterlist *sg, int nents)
         int i;
 
         for_each_sg(sg, s, nents, i) {
-                if (sg_dma_address(s) != IOMMU_MAPPING_ERROR)
+                if (sg_dma_address(s) != DMA_MAPPING_ERROR)
                         s->offset += sg_dma_address(s);
                 if (sg_dma_len(s))
                         s->length = sg_dma_len(s);
-                sg_dma_address(s) = IOMMU_MAPPING_ERROR;
+                sg_dma_address(s) = DMA_MAPPING_ERROR;
                 sg_dma_len(s) = 0;
         }
 }
@@ -858,11 +856,6 @@ void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,
         __iommu_dma_unmap(iommu_get_dma_domain(dev), handle, size);
 }
 
-int iommu_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return dma_addr == IOMMU_MAPPING_ERROR;
-}
-
 static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev,
                 phys_addr_t msi_addr, struct iommu_domain *domain)
 {
@@ -882,7 +875,7 @@ static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev,
                 return NULL;
 
         iova = __iommu_dma_map(dev, msi_addr, size, prot, domain);
-        if (iommu_dma_mapping_error(dev, iova))
+        if (iova == DMA_MAPPING_ERROR)
                 goto out_free_page;
 
         INIT_LIST_HEAD(&msi_page->list);