From f4beed0eecd997cf8fa5fd924df960eb4fff350a Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Mon, 17 Dec 2018 15:35:06 -0800 Subject: [PATCH] gpu: nvgpu: MISRA rule 21.2 fixes in VM Rename __nvgpu_vm_int() to nvgpu_vm_do_init(). JIRA NVGPU-1029 Change-Id: Iae8d8ff408d0721a8b7c5f3295875488fa8ccdc8 Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1974841 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Scott Long Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/mm/vm.c | 26 +++++++++++++------------- drivers/gpu/nvgpu/include/nvgpu/vm.h | 20 ++++++++++---------- 2 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 9b0576c41..1dee80744 100644 --- a/drivers/gpu/nvgpu/common/mm/vm.c +++ b/drivers/gpu/nvgpu/common/mm/vm.c @@ -274,16 +274,16 @@ static int nvgpu_init_sema_pool(struct vm_gk20a *vm) /* * Initialize a preallocated vm */ -int __nvgpu_vm_init(struct mm_gk20a *mm, - struct vm_gk20a *vm, - u32 big_page_size, - u64 low_hole, - u64 kernel_reserved, - u64 aperture_size, - bool big_pages, - bool userspace_managed, - bool unified_va, - const char *name) +int nvgpu_vm_do_init(struct mm_gk20a *mm, + struct vm_gk20a *vm, + u32 big_page_size, + u64 low_hole, + u64 kernel_reserved, + u64 aperture_size, + bool big_pages, + bool userspace_managed, + bool unified_va, + const char *name) { int err = 0; char alloc_name[32]; @@ -587,9 +587,9 @@ struct vm_gk20a *nvgpu_vm_init(struct gk20a *g, return NULL; } - if (__nvgpu_vm_init(&g->mm, vm, big_page_size, low_hole, - kernel_reserved, aperture_size, big_pages, - userspace_managed, unified_va, name) != 0) { + if (nvgpu_vm_do_init(&g->mm, vm, big_page_size, low_hole, + kernel_reserved, aperture_size, big_pages, + userspace_managed, unified_va, name) != 0) { nvgpu_kfree(g, vm); return NULL; } diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vm.h index 79f2a380d..95faef6e3 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/vm.h +++ b/drivers/gpu/nvgpu/include/nvgpu/vm.h @@ -295,16 +295,16 @@ int nvgpu_insert_mapped_buf(struct vm_gk20a *vm, /* * Initialize a preallocated vm */ -int __nvgpu_vm_init(struct mm_gk20a *mm, - struct vm_gk20a *vm, - u32 big_page_size, - u64 low_hole, - u64 kernel_reserved, - u64 aperture_size, - bool big_pages, - bool userspace_managed, - bool unified_va, - const char *name); +int nvgpu_vm_do_init(struct mm_gk20a *mm, + struct vm_gk20a *vm, + u32 big_page_size, + u64 low_hole, + u64 kernel_reserved, + u64 aperture_size, + bool big_pages, + bool userspace_managed, + bool unified_va, + const char *name); struct vm_gk20a *nvgpu_vm_init(struct gk20a *g, u32 big_page_size,