diff options
author | Thomas Fleury <tfleury@nvidia.com> | 2017-10-24 19:23:09 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-06 16:41:40 -0500 |
commit | beab3b04cbac55675c0a82f81ca6e26d7931c411 (patch) | |
tree | ac978dad3c32ac789a57faf7c3638225e2c15f45 | |
parent | 94feb18de8a687bef7c94999161b6bebaa382709 (diff) |
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 <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1586597
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: David Martinez Nieto <dmartineznie@nvidia.com>
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | 15 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | 15 |
2 files changed, 0 insertions, 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, | |||
49 | if (status) | 49 | if (status) |
50 | goto boardobjgrpconstruct_e255_exit; | 50 | goto boardobjgrpconstruct_e255_exit; |
51 | 51 | ||
52 | pboardobjgrp_e255->super.destruct = boardobjgrpdestruct_e255; | ||
53 | |||
54 | pboardobjgrp_e255->super.pmuhdrdatainit = | 52 | pboardobjgrp_e255->super.pmuhdrdatainit = |
55 | boardobjgrp_pmuhdrdatainit_e255; | 53 | boardobjgrp_pmuhdrdatainit_e255; |
56 | 54 | ||
@@ -58,19 +56,6 @@ boardobjgrpconstruct_e255_exit: | |||
58 | return status; | 56 | return status; |
59 | } | 57 | } |
60 | 58 | ||
61 | u32 boardobjgrpdestruct_e255(struct boardobjgrp *pboardobjgrp) | ||
62 | { | ||
63 | u32 status = 0; | ||
64 | |||
65 | gk20a_dbg_info(""); | ||
66 | |||
67 | pboardobjgrp->mask = NULL; | ||
68 | pboardobjgrp->objslots = 0; | ||
69 | pboardobjgrp->ppobjects = NULL; | ||
70 | |||
71 | return status; | ||
72 | } | ||
73 | |||
74 | u32 boardobjgrp_pmuhdrdatainit_e255(struct gk20a *g, | 59 | u32 boardobjgrp_pmuhdrdatainit_e255(struct gk20a *g, |
75 | struct boardobjgrp *pboardobjgrp, | 60 | struct boardobjgrp *pboardobjgrp, |
76 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, | 61 | 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, | |||
50 | if (status) | 50 | if (status) |
51 | goto boardobjgrpconstruct_e32_exit; | 51 | goto boardobjgrpconstruct_e32_exit; |
52 | 52 | ||
53 | pboardobjgrp_e32->super.destruct = boardobjgrpdestruct_e32; | ||
54 | |||
55 | pboardobjgrp_e32->super.pmuhdrdatainit = boardobjgrp_pmuhdrdatainit_e32; | 53 | pboardobjgrp_e32->super.pmuhdrdatainit = boardobjgrp_pmuhdrdatainit_e32; |
56 | 54 | ||
57 | boardobjgrpconstruct_e32_exit: | 55 | boardobjgrpconstruct_e32_exit: |
58 | return status; | 56 | return status; |
59 | } | 57 | } |
60 | 58 | ||
61 | u32 boardobjgrpdestruct_e32(struct boardobjgrp *pboardobjgrp) | ||
62 | { | ||
63 | u32 status = 0; | ||
64 | |||
65 | gk20a_dbg_info(""); | ||
66 | |||
67 | pboardobjgrp->mask = NULL; | ||
68 | pboardobjgrp->objslots = 0; | ||
69 | pboardobjgrp->ppobjects = NULL; | ||
70 | |||
71 | return status; | ||
72 | } | ||
73 | |||
74 | u32 boardobjgrp_pmuhdrdatainit_e32(struct gk20a *g, | 59 | u32 boardobjgrp_pmuhdrdatainit_e32(struct gk20a *g, |
75 | struct boardobjgrp *pboardobjgrp, | 60 | struct boardobjgrp *pboardobjgrp, |
76 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, | 61 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, |