diff options
author | Srirangan <smadhavan@nvidia.com> | 2018-08-28 01:39:19 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-28 09:47:36 -0400 |
commit | 361eca66b58051d46daad1b600eef1f72b7f15c0 (patch) | |
tree | e101ab419710c0ceb3b641098210d4147c11919e /drivers/gpu/nvgpu/boardobj/boardobj.c | |
parent | 4032e8915a65aa94f8b556676c5606683ec28f52 (diff) |
gpu: nvgpu: boardobj: Fix MISRA 15.6 violations
MISRA Rule-15.6 requires that all if-else blocks be enclosed in braces,
including single statement blocks. Fix errors due to single statement
if blocks without braces, introducing the braces.
JIRA NVGPU-671
Change-Id: I604d85367cd4b99c39df2b9fa2d7a7219ef941d5
Signed-off-by: Srirangan <smadhavan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1807153
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/boardobj/boardobj.c')
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobj.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c index f38c7c4a..5f726935 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.c +++ b/drivers/gpu/nvgpu/boardobj/boardobj.c | |||
@@ -34,13 +34,15 @@ u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, | |||
34 | 34 | ||
35 | nvgpu_log_info(g, " "); | 35 | nvgpu_log_info(g, " "); |
36 | 36 | ||
37 | if (devtmp == NULL) | 37 | if (devtmp == NULL) { |
38 | return -EINVAL; | 38 | return -EINVAL; |
39 | } | ||
39 | 40 | ||
40 | if (*ppboardobj == NULL) { | 41 | if (*ppboardobj == NULL) { |
41 | *ppboardobj = nvgpu_kzalloc(g, size); | 42 | *ppboardobj = nvgpu_kzalloc(g, size); |
42 | if (*ppboardobj == NULL) | 43 | if (*ppboardobj == NULL) { |
43 | return -ENOMEM; | 44 | return -ENOMEM; |
45 | } | ||
44 | (*ppboardobj)->allocated = true; | 46 | (*ppboardobj)->allocated = true; |
45 | } | 47 | } |
46 | 48 | ||
@@ -64,12 +66,14 @@ u32 boardobj_destruct_super(struct boardobj *pboardobj) | |||
64 | struct gk20a *g = pboardobj->g; | 66 | struct gk20a *g = pboardobj->g; |
65 | 67 | ||
66 | nvgpu_log_info(g, " "); | 68 | nvgpu_log_info(g, " "); |
67 | if (pboardobj == NULL) | 69 | if (pboardobj == NULL) { |
68 | return -EINVAL; | 70 | return -EINVAL; |
71 | } | ||
69 | 72 | ||
70 | nvgpu_list_del(&pboardobj->node); | 73 | nvgpu_list_del(&pboardobj->node); |
71 | if (pboardobj->allocated) | 74 | if (pboardobj->allocated) { |
72 | nvgpu_kfree(pboardobj->g, pboardobj); | 75 | nvgpu_kfree(pboardobj->g, pboardobj); |
76 | } | ||
73 | 77 | ||
74 | return 0; | 78 | return 0; |
75 | } | 79 | } |
@@ -86,10 +90,12 @@ u32 boardobj_pmudatainit_super(struct gk20a *g, struct boardobj *pboardobj, | |||
86 | struct nv_pmu_boardobj *pmudata) | 90 | struct nv_pmu_boardobj *pmudata) |
87 | { | 91 | { |
88 | nvgpu_log_info(g, " "); | 92 | nvgpu_log_info(g, " "); |
89 | if (pboardobj == NULL) | 93 | if (pboardobj == NULL) { |
90 | return -EINVAL; | 94 | return -EINVAL; |
91 | if (pmudata == NULL) | 95 | } |
96 | if (pmudata == NULL) { | ||
92 | return -EINVAL; | 97 | return -EINVAL; |
98 | } | ||
93 | pmudata->type = pboardobj->type; | 99 | pmudata->type = pboardobj->type; |
94 | nvgpu_log_info(g, " Done"); | 100 | nvgpu_log_info(g, " Done"); |
95 | return 0; | 101 | return 0; |