From beab3b04cbac55675c0a82f81ca6e26d7931c411 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Tue, 24 Oct 2017 16:23:09 -0700 Subject: gpu: nvgpu: use common destructor for boardobjgrp Use boardobjgrp_super for boardobj_e255 and boardobj_32. In both cases, we want the destructor to remove and destroy related objects, as well as freeing any pmucmd buffer. JIRA EVLR-1959 Bug 200352099 Change-Id: I220d2d6b26347a36d73028db6740fcc2ef702987 Signed-off-by: Thomas Fleury Reviewed-on: https://git-master.nvidia.com/r/1586597 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: David Martinez Nieto Reviewed-by: Richard Zhao Reviewed-by: Alex Waterman Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | 15 --------------- drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c index a6223e9a..7aabb89e 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c @@ -49,8 +49,6 @@ u32 boardobjgrpconstruct_e255(struct gk20a *g, if (status) goto boardobjgrpconstruct_e255_exit; - pboardobjgrp_e255->super.destruct = boardobjgrpdestruct_e255; - pboardobjgrp_e255->super.pmuhdrdatainit = boardobjgrp_pmuhdrdatainit_e255; @@ -58,19 +56,6 @@ boardobjgrpconstruct_e255_exit: return status; } -u32 boardobjgrpdestruct_e255(struct boardobjgrp *pboardobjgrp) -{ - u32 status = 0; - - gk20a_dbg_info(""); - - pboardobjgrp->mask = NULL; - pboardobjgrp->objslots = 0; - pboardobjgrp->ppobjects = NULL; - - return status; -} - u32 boardobjgrp_pmuhdrdatainit_e255(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c index 53380e95..e793e34c 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c @@ -50,27 +50,12 @@ u32 boardobjgrpconstruct_e32(struct gk20a *g, if (status) goto boardobjgrpconstruct_e32_exit; - pboardobjgrp_e32->super.destruct = boardobjgrpdestruct_e32; - pboardobjgrp_e32->super.pmuhdrdatainit = boardobjgrp_pmuhdrdatainit_e32; boardobjgrpconstruct_e32_exit: return status; } -u32 boardobjgrpdestruct_e32(struct boardobjgrp *pboardobjgrp) -{ - u32 status = 0; - - gk20a_dbg_info(""); - - pboardobjgrp->mask = NULL; - pboardobjgrp->objslots = 0; - pboardobjgrp->ppobjects = NULL; - - return status; -} - u32 boardobjgrp_pmuhdrdatainit_e32(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, -- cgit v1.2.2