1 files changed, 20 insertions, 42 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index f87ba605..4b811ddf 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -536,61 +536,39 @@ u64 gk20a_gmmu_fixed_map(struct vm_gk20a *vm,
                 bool priv,
                 enum gk20a_aperture aperture);
 
-int gk20a_gmmu_alloc_map(struct vm_gk20a *vm,
-                size_t size,
+int gk20a_gmmu_alloc_map(struct vm_gk20a *vm, size_t size,
                 struct mem_desc *mem);
+int gk20a_gmmu_alloc_map_attr(struct vm_gk20a *vm, enum dma_attr attr,
+                size_t size, struct mem_desc *mem);
 
-int gk20a_gmmu_alloc_map_attr(struct vm_gk20a *vm,
-                enum dma_attr attr,
-                size_t size,
+int gk20a_gmmu_alloc_map_sys(struct vm_gk20a *vm, size_t size,
                 struct mem_desc *mem);
+int gk20a_gmmu_alloc_map_attr_sys(struct vm_gk20a *vm, enum dma_attr attr,
+                size_t size, struct mem_desc *mem);
 
-int gk20a_gmmu_alloc_map_vid(struct vm_gk20a *vm,
-                size_t size,
+int gk20a_gmmu_alloc_map_vid(struct vm_gk20a *vm, size_t size,
                 struct mem_desc *mem);
+int gk20a_gmmu_alloc_map_attr_vid(struct vm_gk20a *vm, enum dma_attr attr,
+                size_t size, struct mem_desc *mem);
 
-int gk20a_gmmu_alloc_map_attr_vid(struct vm_gk20a *vm,
-                enum dma_attr attr,
-                size_t size,
-                struct mem_desc *mem);
-
-void gk20a_gmmu_unmap_free(struct vm_gk20a *vm,
-                struct mem_desc *mem);
-
-int gk20a_gmmu_alloc(struct gk20a *g,
-                size_t size,
-                struct mem_desc *mem);
+void gk20a_gmmu_unmap_free(struct vm_gk20a *vm, struct mem_desc *mem);
 
-int gk20a_gmmu_alloc_attr(struct gk20a *g,
-                enum dma_attr attr,
-                size_t size,
+int gk20a_gmmu_alloc(struct gk20a *g, size_t size, struct mem_desc *mem);
+int gk20a_gmmu_alloc_attr(struct gk20a *g, enum dma_attr attr, size_t size,
                 struct mem_desc *mem);
 
-int gk20a_gmmu_alloc_attr_sys(struct gk20a *g,
-                enum dma_attr attr,
-                size_t size,
+int gk20a_gmmu_alloc_sys(struct gk20a *g, size_t size, struct mem_desc *mem);
+int gk20a_gmmu_alloc_attr_sys(struct gk20a *g, enum dma_attr attr, size_t size,
                 struct mem_desc *mem);
 
-int gk20a_gmmu_alloc_vid(struct gk20a *g,
-                size_t size,
-                struct mem_desc *mem);
-
-int gk20a_gmmu_alloc_attr_vid(struct gk20a *g,
-                enum dma_attr attr,
-                size_t size,
-                struct mem_desc *mem);
-
-int gk20a_gmmu_alloc_attr_vid_at(struct gk20a *g,
-                enum dma_attr attr,
-                size_t size,
-                struct mem_desc *mem,
-                dma_addr_t at);
-
-void gk20a_gmmu_free(struct gk20a *g,
+int gk20a_gmmu_alloc_vid(struct gk20a *g, size_t size, struct mem_desc *mem);
+int gk20a_gmmu_alloc_attr_vid(struct gk20a *g, enum dma_attr attr, size_t size,
                 struct mem_desc *mem);
+int gk20a_gmmu_alloc_attr_vid_at(struct gk20a *g, enum dma_attr attr,
+                size_t size, struct mem_desc *mem, dma_addr_t at);
 
-void gk20a_gmmu_free_attr(struct gk20a *g,
-                enum dma_attr attr,
+void gk20a_gmmu_free(struct gk20a *g, struct mem_desc *mem);
+void gk20a_gmmu_free_attr(struct gk20a *g, enum dma_attr attr,
                 struct mem_desc *mem);
 
 static inline phys_addr_t gk20a_mem_phys(struct mem_desc *mem)