From 07d3387ceb10cdc4d4413d04b1223cbd5181438b Mon Sep 17 00:00:00 2001 From: Srirangan Date: Mon, 20 Aug 2018 16:09:12 +0530 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1796674 Reviewed-by: svc-misra-checker Reviewed-by: Scott Long GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/acr_gv11b.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/acr_gv11b.c') 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) acr->acr_ucode.gpu_va + acr_ucode_header_t210_load[2]); bl_dmem_desc->data_size = acr_ucode_header_t210_load[3]; - } else + } else { acr->acr_dmem_desc_v1->nonwpr_ucode_blob_size = 0; + } status = pmu_exec_gen_bl(g, bl_dmem_desc, 1); if (status != 0) { err = status; @@ -277,10 +278,12 @@ int gv11b_init_pmu_setup_hw1(struct gk20a *g, pmu->isr_enabled = true; nvgpu_mutex_release(&pmu->isr_mutex); - if (g->ops.pmu.setup_apertures) + if (g->ops.pmu.setup_apertures) { g->ops.pmu.setup_apertures(g); - if (g->ops.pmu.update_lspmu_cmdline_args) + } + if (g->ops.pmu.update_lspmu_cmdline_args) { g->ops.pmu.update_lspmu_cmdline_args(g); + } /*disable irqs for hs falcon booting as we will poll for halt*/ nvgpu_mutex_acquire(&pmu->isr_mutex); @@ -290,7 +293,8 @@ int gv11b_init_pmu_setup_hw1(struct gk20a *g, /*Clearing mailbox register used to reflect capabilities*/ gk20a_writel(g, pwr_falcon_mailbox1_r(), 0); err = bl_bootstrap(pmu, desc, bl_sz); - if (err) + if (err) { return err; + } return 0; } -- cgit v1.2.2