summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2017-06-05 05:12:38 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-06 11:13:43 -0400
commit793bc318c558295f8c2a0a2af3e7729dcece6208 (patch)
treeff5bd7a6f89f922ad3e4355e4501b1b5b60e9cf5 /drivers/gpu/nvgpu/common
parentfe868356339182f0aa21a4424f5ef08229f8ebd6 (diff)
gpu: nvgpu: remove logically dead code
In nvgpu_vm_map(), variable "inserted" can never be true in error path Hence remove the logically dead code Bug 200291879 Coverity id : 2567920 Change-Id: I5428f7d52f1d4f815c04d90ea651668dd72ba985 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/1495906 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r--drivers/gpu/nvgpu/common/linux/vm.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c
index c2d80e2d..4fa01855 100644
--- a/drivers/gpu/nvgpu/common/linux/vm.c
+++ b/drivers/gpu/nvgpu/common/linux/vm.c
@@ -188,7 +188,7 @@ u64 nvgpu_vm_map(struct vm_gk20a *vm,
188 struct gk20a *g = gk20a_from_vm(vm); 188 struct gk20a *g = gk20a_from_vm(vm);
189 struct gk20a_comptag_allocator *ctag_allocator = &g->gr.comp_tags; 189 struct gk20a_comptag_allocator *ctag_allocator = &g->gr.comp_tags;
190 struct nvgpu_mapped_buf *mapped_buffer = NULL; 190 struct nvgpu_mapped_buf *mapped_buffer = NULL;
191 bool inserted = false, va_allocated = false; 191 bool va_allocated = false;
192 u64 map_offset = 0; 192 u64 map_offset = 0;
193 int err = 0; 193 int err = 0;
194 struct buffer_attrs bfr = {NULL}; 194 struct buffer_attrs bfr = {NULL};
@@ -372,7 +372,6 @@ u64 nvgpu_vm_map(struct vm_gk20a *vm,
372 nvgpu_err(g, "failed to insert into mapped buffer tree"); 372 nvgpu_err(g, "failed to insert into mapped buffer tree");
373 goto clean_up; 373 goto clean_up;
374 } 374 }
375 inserted = true;
376 if (user_mapped) 375 if (user_mapped)
377 vm->num_user_mapped_buffers++; 376 vm->num_user_mapped_buffers++;
378 377
@@ -387,11 +386,6 @@ u64 nvgpu_vm_map(struct vm_gk20a *vm,
387 return map_offset; 386 return map_offset;
388 387
389clean_up: 388clean_up:
390 if (inserted) {
391 nvgpu_remove_mapped_buf(vm, mapped_buffer);
392 if (user_mapped)
393 vm->num_user_mapped_buffers--;
394 }
395 nvgpu_kfree(g, mapped_buffer); 389 nvgpu_kfree(g, mapped_buffer);
396 if (va_allocated) 390 if (va_allocated)
397 __nvgpu_vm_free_va(vm, map_offset, bfr.pgsz_idx); 391 __nvgpu_vm_free_va(vm, map_offset, bfr.pgsz_idx);