diff --git a/drivers/video/tegra/nvmap/nvmap_cache.c b/drivers/video/tegra/nvmap/nvmap_cache.c
index 937f508c..db50936a 100644
--- a/drivers/video/tegra/nvmap/nvmap_cache.c
+++ b/drivers/video/tegra/nvmap/nvmap_cache.c
@@ -63,9 +63,9 @@ void inner_cache_maint(unsigned int op, void *vaddr, size_t size)
 		__dma_flush_area(vaddr, size);
 #endif
 	else if (op == NVMAP_CACHE_OP_INV)
-		__dma_map_area(vaddr, size, DMA_FROM_DEVICE);
+		__dma_map_area_from_device(vaddr, size);
 	else
-		__dma_map_area(vaddr, size, DMA_TO_DEVICE);
+		__dma_map_area_to_device(vaddr, size);
 }
 
 static void heap_page_cache_maint(
diff --git a/drivers/video/tegra/nvmap/nvmap_cache_maint.S b/drivers/video/tegra/nvmap/nvmap_cache_maint.S
index c0b6d961..f1debff3 100644
--- a/drivers/video/tegra/nvmap/nvmap_cache_maint.S
+++ b/drivers/video/tegra/nvmap/nvmap_cache_maint.S
@@ -185,25 +185,20 @@ SYM_FUNC_START(__dma_flush_area)
 SYM_FUNC_END(__dma_flush_area)
 
 /*
- *	__dma_map_area(start, size, dir)
+ *	__dma_map_area_from_device(start, size)
  *	- start	- kernel virtual start address
  *	- size	- size of region
- *	- dir	- DMA direction
  */
-SYM_FUNC_START(__dma_map_area)
-	cmp	w2, #DMA_FROM_DEVICE
-	b.eq	__dma_inv_area
+SYM_FUNC_START(__dma_map_area_from_device)
+	b	__dma_inv_area
 	b	__dma_clean_area
-SYM_FUNC_END(__dma_map_area)
+SYM_FUNC_END(__dma_map_area_from_device)
 
 /*
- *	__dma_unmap_area(start, size, dir)
+ *	__dma_map_area_to_device(start, size)
  *	- start	- kernel virtual start address
  *	- size	- size of region
- *	- dir	- DMA direction
  */
-SYM_FUNC_START(__dma_unmap_area)
-	cmp	w2, #DMA_TO_DEVICE
-	b.ne	__dma_inv_area
-	ret
-SYM_FUNC_END(__dma_unmap_area)
+SYM_FUNC_START(__dma_map_area_to_device)
+	b	__dma_clean_area
+SYM_FUNC_END(__dma_map_area_to_device)
diff --git a/drivers/video/tegra/nvmap/nvmap_priv.h b/drivers/video/tegra/nvmap/nvmap_priv.h
index 66c1c9f2..6371b673 100644
--- a/drivers/video/tegra/nvmap/nvmap_priv.h
+++ b/drivers/video/tegra/nvmap/nvmap_priv.h
@@ -949,7 +949,8 @@ void nvmap_dma_mark_declared_memory_unoccupied(struct device *dev,
 					 dma_addr_t device_addr, size_t size);
 
 extern void __dma_flush_area(const void *cpu_va, size_t size);
-extern void __dma_map_area(const void *cpu_va, size_t size, int dir);
+void __dma_map_area_from_device(const void *cpu_va, size_t size);
+void __dma_map_area_to_device(const void *cpu_va, size_t size);
 
 int nvmap_assign_pages_to_handle(struct nvmap_client *client,
 		struct nvmap_handle **hs, struct nvmap_handle *h,