From 2c95becc9edf5e9ebfa392c4b6c3fbd0b9580f8d Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 5 Sep 2018 16:09:43 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1813623 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 5b76f166..6d5bea30 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -220,7 +220,7 @@ static void __update_pte(struct vm_gk20a *vm, pte_w[0] |= gmmu_pte_privilege_true_f(); } - pte_w[1] = __nvgpu_aperture_mask(g, attrs->aperture, + pte_w[1] = nvgpu_aperture_mask_coh(g, attrs->aperture, gmmu_pte_aperture_sys_mem_ncoh_f(), gmmu_pte_aperture_sys_mem_coh_f(), gmmu_pte_aperture_video_memory_f()) | -- cgit v1.2.2