From 4032e8915a65aa94f8b556676c5606683ec28f52 Mon Sep 17 00:00:00 2001 From: Srirangan Date: Thu, 23 Aug 2018 12:07:41 +0530 Subject: gpu: nvgpu: gm20b: 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: I1651ae8ee680bdeb48606569c4e8c2fc7cb87f20 Signed-off-by: Srirangan Reviewed-on: https://git-master.nvidia.com/r/1805077 Reviewed-by: Konsta Holtta Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b/fifo_gm20b.c') diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index f0635b83..dd11d2c7 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c @@ -99,9 +99,10 @@ void gm20b_fifo_trigger_mmu_fault(struct gk20a *g, } else { u32 mmu_id = gm20b_engine_id_to_mmu_id(g, engine_id); - if (mmu_id != (u32)~0) + if (mmu_id != (u32)~0) { gk20a_writel(g, fifo_trigger_mmu_fault_r(mmu_id), fifo_trigger_mmu_fault_enable_f(1)); + } } } @@ -120,8 +121,9 @@ void gm20b_fifo_trigger_mmu_fault(struct gk20a *g, delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); } while (!nvgpu_timeout_expired(&timeout)); - if (ret) + if (ret) { nvgpu_err(g, "mmu fault timeout"); + } /* release mmu fault trigger */ for_each_set_bit(engine_id, &engine_ids, 32) { @@ -150,9 +152,10 @@ void gm20b_device_info_data_parse(struct gk20a *g, *fault_id = top_device_info_data_fault_id_enum_v(table_entry); } - } else + } else { nvgpu_err(g, "unknown device_info_data %d", top_device_info_data_type_v(table_entry)); + } } void gm20b_fifo_init_pbdma_intr_descs(struct fifo_gk20a *f) @@ -250,10 +253,11 @@ static const char * const gm20b_gpc_client_descs[] = { void gm20b_fifo_get_mmu_fault_gpc_desc(struct mmu_fault_info *mmfault) { - if (mmfault->client_id >= ARRAY_SIZE(gm20b_gpc_client_descs)) + if (mmfault->client_id >= ARRAY_SIZE(gm20b_gpc_client_descs)) { WARN_ON(mmfault->client_id >= ARRAY_SIZE(gm20b_gpc_client_descs)); - else + } else { mmfault->client_id_desc = gm20b_gpc_client_descs[mmfault->client_id]; + } } -- cgit v1.2.2