gpu: nvgpu: Fix MISRA 21.2 violations (nvgpu_mem.c, mm.c)

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.

Handle the 21.2 fixes for nvgpu_mem.c and mm.c; this deletes the
'__' prefixes and slightly renames the __nvgpu_aperture_mask()
function since there's a coherent version and a general version.

Change-Id: Iee871ad90db3f2622f9099bd9992eb994e0fbf34
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1813623
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
index ab75b136..e251f3c4 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
@@ -33,8 +33,9 @@
  * will not add any checks. If you want to simply use the default coherency then
  * use nvgpu_aperture_mask().
  */
-u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture,
-                          u32 sysmem_mask, u32 sysmem_coh_mask, u32 vidmem_mask)
+u32 nvgpu_aperture_mask_coh(struct gk20a *g, enum nvgpu_aperture aperture,
+                            u32 sysmem_mask, u32 sysmem_coh_mask,
+                            u32 vidmem_mask)
 {
         /*
          * Some iGPUs treat sysmem (i.e SoC DRAM) as vidmem. In these cases the
@@ -45,7 +46,7 @@ u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture,
         }
 
         switch (aperture) {
-        case __APERTURE_SYSMEM_COH:
+        case APERTURE_SYSMEM_COH:
                 return sysmem_coh_mask;
         case APERTURE_SYSMEM:
                 return sysmem_mask;
@@ -69,16 +70,18 @@ u32 nvgpu_aperture_mask(struct gk20a *g, struct nvgpu_mem *mem,
          */
         if (nvgpu_is_enabled(g, NVGPU_USE_COHERENT_SYSMEM) &&
             ap == APERTURE_SYSMEM) {
-                ap = __APERTURE_SYSMEM_COH;
+                ap = APERTURE_SYSMEM_COH;
         }
 
-        return __nvgpu_aperture_mask(g, ap,
-                                     sysmem_mask, sysmem_coh_mask, vidmem_mask);
+        return nvgpu_aperture_mask_coh(g, ap,
+                                       sysmem_mask,
+                                       sysmem_coh_mask,
+                                       vidmem_mask);
 }
 
 bool nvgpu_aperture_is_sysmem(enum nvgpu_aperture ap)
 {
-        return ap == __APERTURE_SYSMEM_COH || ap == APERTURE_SYSMEM;
+        return ap == APERTURE_SYSMEM_COH || ap == APERTURE_SYSMEM;
 }
 
 bool nvgpu_mem_is_sysmem(struct nvgpu_mem *mem)