diff options
author | Srirangan <smadhavan@nvidia.com> | 2018-08-20 06:39:12 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-28 09:46:59 -0400 |
commit | 07d3387ceb10cdc4d4413d04b1223cbd5181438b (patch) | |
tree | c86a661e6bff08c43f45fdb2b79be9ba1a6531b1 /drivers/gpu/nvgpu/gv11b/acr_gv11b.c | |
parent | 3e5e4804f9c2bf5b914012852b56dbbbc00f8253 (diff) |
gpu: nvgpu: gv11b: 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: I1562bd1b109a100af29bd147ed8b56463b6a8e63
Signed-off-by: Srirangan <smadhavan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1796674
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Scott Long <scottl@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/gv11b/acr_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/acr_gv11b.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c index fdd0f123..a6bbaa40 100644 --- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c | |||
@@ -187,8 +187,9 @@ int gv11b_bootstrap_hs_flcn(struct gk20a *g) | |||
187 | acr->acr_ucode.gpu_va + | 187 | acr->acr_ucode.gpu_va + |
188 | acr_ucode_header_t210_load[2]); | 188 | acr_ucode_header_t210_load[2]); |
189 | bl_dmem_desc->data_size = acr_ucode_header_t210_load[3]; | 189 | bl_dmem_desc->data_size = acr_ucode_header_t210_load[3]; |
190 | } else | 190 | } else { |
191 | acr->acr_dmem_desc_v1->nonwpr_ucode_blob_size = 0; | 191 | acr->acr_dmem_desc_v1->nonwpr_ucode_blob_size = 0; |
192 | } | ||
192 | status = pmu_exec_gen_bl(g, bl_dmem_desc, 1); | 193 | status = pmu_exec_gen_bl(g, bl_dmem_desc, 1); |
193 | if (status != 0) { | 194 | if (status != 0) { |
194 | err = status; | 195 | err = status; |
@@ -277,10 +278,12 @@ int gv11b_init_pmu_setup_hw1(struct gk20a *g, | |||
277 | pmu->isr_enabled = true; | 278 | pmu->isr_enabled = true; |
278 | nvgpu_mutex_release(&pmu->isr_mutex); | 279 | nvgpu_mutex_release(&pmu->isr_mutex); |
279 | 280 | ||
280 | if (g->ops.pmu.setup_apertures) | 281 | if (g->ops.pmu.setup_apertures) { |
281 | g->ops.pmu.setup_apertures(g); | 282 | g->ops.pmu.setup_apertures(g); |
282 | if (g->ops.pmu.update_lspmu_cmdline_args) | 283 | } |
284 | if (g->ops.pmu.update_lspmu_cmdline_args) { | ||
283 | g->ops.pmu.update_lspmu_cmdline_args(g); | 285 | g->ops.pmu.update_lspmu_cmdline_args(g); |
286 | } | ||
284 | 287 | ||
285 | /*disable irqs for hs falcon booting as we will poll for halt*/ | 288 | /*disable irqs for hs falcon booting as we will poll for halt*/ |
286 | nvgpu_mutex_acquire(&pmu->isr_mutex); | 289 | nvgpu_mutex_acquire(&pmu->isr_mutex); |
@@ -290,7 +293,8 @@ int gv11b_init_pmu_setup_hw1(struct gk20a *g, | |||
290 | /*Clearing mailbox register used to reflect capabilities*/ | 293 | /*Clearing mailbox register used to reflect capabilities*/ |
291 | gk20a_writel(g, pwr_falcon_mailbox1_r(), 0); | 294 | gk20a_writel(g, pwr_falcon_mailbox1_r(), 0); |
292 | err = bl_bootstrap(pmu, desc, bl_sz); | 295 | err = bl_bootstrap(pmu, desc, bl_sz); |
293 | if (err) | 296 | if (err) { |
294 | return err; | 297 | return err; |
298 | } | ||
295 | return 0; | 299 | return 0; |
296 | } | 300 | } |