gpu: nvgpu: Fix MISRA 21.2 violations (public allocator APIs)

MISRA 21.2 states that we may not use reserved identifiers; since
all identifiers beginning with '_' are reserved by libc, the usage
of '__' as a prefix is disallowed.

This fixes places in the public allocator APIs. This consists of
the various init routines which are used to create an allocator
and the debug macro used within the allocator code.

The buddy allocator was handled by collapsing the internal
'__' prepended version with the non-prefixed version. The only
required change was in the page_allocator code which now had to
pass in a NULL vm pointer (since the VM is not needed for managing
VIDMEM).

JIRA NVGPU-1029

Change-Id: I484a144e61789bf594c525c1ca307b96d120830f
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1813578
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index 57d9afb5..b2b83767 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -420,14 +420,14 @@ int __nvgpu_vm_init(struct mm_gk20a *mm,
          */
         if (user_vma_start < user_vma_limit) {
                 snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s", name);
-                err = __nvgpu_buddy_allocator_init(g, &vm->user,
-                                                   vm, alloc_name,
-                                                   user_vma_start,
-                                                   user_vma_limit -
-                                                   user_vma_start,
-                                                   SZ_4K,
-                                                   GPU_BALLOC_MAX_ORDER,
-                                                   GPU_ALLOC_GVA_SPACE);
+                err = nvgpu_buddy_allocator_init(g, &vm->user,
+                                                 vm, alloc_name,
+                                                 user_vma_start,
+                                                 user_vma_limit -
+                                                 user_vma_start,
+                                                 SZ_4K,
+                                                 GPU_BALLOC_MAX_ORDER,
+                                                 GPU_ALLOC_GVA_SPACE);
                 if (err) {
                         goto clean_up_page_tables;
                 }
@@ -446,14 +446,14 @@ int __nvgpu_vm_init(struct mm_gk20a *mm,
          */
         if (user_lp_vma_start < user_lp_vma_limit) {
                 snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s_lp", name);
-                err = __nvgpu_buddy_allocator_init(g, &vm->user_lp,
-                                                   vm, alloc_name,
-                                                   user_lp_vma_start,
-                                                   user_lp_vma_limit -
-                                                   user_lp_vma_start,
-                                                   vm->big_page_size,
-                                                   GPU_BALLOC_MAX_ORDER,
-                                                   GPU_ALLOC_GVA_SPACE);
+                err = nvgpu_buddy_allocator_init(g, &vm->user_lp,
+                                                 vm, alloc_name,
+                                                 user_lp_vma_start,
+                                                 user_lp_vma_limit -
+                                                 user_lp_vma_start,
+                                                 vm->big_page_size,
+                                                 GPU_BALLOC_MAX_ORDER,
+                                                 GPU_ALLOC_GVA_SPACE);
                 if (err) {
                         goto clean_up_allocators;
                 }
@@ -463,13 +463,13 @@ int __nvgpu_vm_init(struct mm_gk20a *mm,
          * Kernel VMA. Must always exist for an address space.
          */
         snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s-sys", name);
-        err = __nvgpu_buddy_allocator_init(g, &vm->kernel,
-                                           vm, alloc_name,
-                                           kernel_vma_start,
-                                           kernel_vma_limit - kernel_vma_start,
-                                           SZ_4K,
-                                           GPU_BALLOC_MAX_ORDER,
-                                           kernel_vma_flags);
+        err = nvgpu_buddy_allocator_init(g, &vm->kernel,
+                                         vm, alloc_name,
+                                         kernel_vma_start,
+                                         kernel_vma_limit - kernel_vma_start,
+                                         SZ_4K,
+                                         GPU_BALLOC_MAX_ORDER,
+                                         kernel_vma_flags);
         if (err) {
                 goto clean_up_allocators;
         }