1 files changed, 1 insertions, 21 deletions

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index d6433e2a3bb4..93b18746d711 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2842,24 +2842,6 @@ static void unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size,
 }
 
 /*
- * This is a special map_sg function which is used if we should map a
- * device which is not handled by an AMD IOMMU in the system.
- */
-static int map_sg_no_iommu(struct device *dev, struct scatterlist *sglist,
-                           int nelems, int dir)
-{
-        struct scatterlist *s;
-        int i;
-
-        for_each_sg(sglist, s, nelems, i) {
-                s->dma_address = (dma_addr_t)sg_phys(s);
-                s->dma_length  = s->length;
-        }
-
-        return nelems;
-}
-
-/*
  * The exported map_sg function for dma_ops (handles scatter-gather
  * lists).
  */
@@ -2878,9 +2860,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
         INC_STATS_COUNTER(cnt_map_sg);
 
         domain = get_domain(dev);
-        if (PTR_ERR(domain) == -EINVAL)
-                return map_sg_no_iommu(dev, sglist, nelems, dir);
-        else if (IS_ERR(domain))
+        if (IS_ERR(domain))
                 return 0;
 
         dma_mask = *dev->dma_mask;