From 3b413d58fa349eca1da9577359546c39effa2c8c Mon Sep 17 00:00:00 2001 From: Srirangan Date: Tue, 4 Sep 2018 16:46:40 +0530 Subject: gpu: nvgpu: volt: 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 by introducing the braces. JIRA NVGPU-671 Change-Id: I938f49b2d1d042dc96573e1a579fe82909a679ab Signed-off-by: Srirangan Reviewed-on: https://git-master.nvidia.com/r/1812421 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/volt/volt_policy.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'drivers/gpu/nvgpu/volt/volt_policy.c') diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c index 3783dc32..4c8737d3 100644 --- a/drivers/gpu/nvgpu/volt/volt_policy.c +++ b/drivers/gpu/nvgpu/volt/volt_policy.c @@ -43,8 +43,9 @@ static u32 construct_volt_policy(struct gk20a *g, u32 status = 0; status = boardobj_construct_super(g, ppboardobj, size, pArgs); - if (status) + if (status) { return status; + } pvolt_policy = (struct voltage_policy *)*ppboardobj; @@ -62,8 +63,9 @@ static u32 construct_volt_policy_split_rail(struct gk20a *g, u32 status = 0; status = construct_volt_policy(g, ppboardobj, size, pArgs); - if (status) + if (status) { return status; + } pvolt_policy = (struct voltage_policy_split_rail *)*ppboardobj; @@ -86,8 +88,9 @@ static u32 construct_volt_policy_single_rail(struct gk20a *g, u32 status = 0; status = construct_volt_policy(g, ppboardobj, size, pArgs); - if (status) + if (status) { return status; + } pvolt_policy = (struct voltage_policy_single_rail *)*ppboardobj; @@ -104,8 +107,9 @@ static u32 volt_policy_pmu_data_init_single_rail(struct gk20a *g, struct nv_pmu_volt_volt_policy_sr_boardobj_set *pset; status = volt_policy_pmu_data_init_super(g, pboardobj, ppmudata); - if (status) + if (status) { goto done; + } ppolicy = (struct voltage_policy_single_rail *)pboardobj; pset = (struct nv_pmu_volt_volt_policy_sr_boardobj_set *) @@ -124,8 +128,9 @@ static u32 volt_policy_pmu_data_init_sr_multi_step(struct gk20a *g, struct nv_pmu_volt_volt_policy_sr_multi_step_boardobj_set *pset; status = volt_policy_pmu_data_init_single_rail(g, pboardobj, ppmudata); - if (status) + if (status) { goto done; + } ppolicy = (struct voltage_policy_single_rail_multi_step *)pboardobj; pset = (struct nv_pmu_volt_volt_policy_sr_multi_step_boardobj_set *) @@ -149,8 +154,9 @@ static u32 volt_construct_volt_policy_single_rail_multi_step(struct gk20a *g, u32 status = 0; status = construct_volt_policy_single_rail(g, ppboardobj, size, pargs); - if (status) + if (status) { return status; + } pboardobj = (*ppboardobj); p_volt_policy = (struct voltage_policy_single_rail_multi_step *) @@ -176,8 +182,9 @@ static u32 volt_policy_pmu_data_init_split_rail(struct gk20a *g, struct nv_pmu_volt_volt_policy_splt_r_boardobj_set *pset; status = volt_policy_pmu_data_init_super(g, pboardobj, ppmudata); - if (status) + if (status) { goto done; + } ppolicy = (struct voltage_policy_split_rail *)pboardobj; pset = (struct nv_pmu_volt_volt_policy_splt_r_boardobj_set *) @@ -201,8 +208,9 @@ static u32 volt_construct_volt_policy_split_rail_single_step(struct gk20a *g, u32 status = 0; status = construct_volt_policy_split_rail(g, ppboardobj, size, pargs); - if (status) + if (status) { return status; + } pboardobj = (*ppboardobj); pboardobj->pmudatainit = volt_policy_pmu_data_init_split_rail; @@ -374,8 +382,9 @@ static u32 _volt_policy_devgrp_pmudata_instget(struct gk20a *g, /*check whether pmuboardobjgrp has a valid boardobj in index*/ if (((u32)BIT(idx) & - pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) + pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) { return -EINVAL; + } *ppboardobjpmudata = (struct nv_pmu_boardobj *) &pgrp_set->objects[idx].data.board_obj; @@ -393,8 +402,9 @@ static u32 _volt_policy_devgrp_pmustatus_instget(struct gk20a *g, /*check whether pmuboardobjgrp has a valid boardobj in index*/ if (((u32)BIT(idx) & - p_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) + p_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) { return -EINVAL; + } *ppboardobjpmustatus = (struct nv_pmu_boardobj_query *) &p_get_status->objects[idx].data.board_obj; @@ -435,8 +445,9 @@ u32 volt_policy_pmu_setup(struct gk20a *g) pboardobjgrp = &g->perf_pmu.volt.volt_policy_metadata.volt_policies.super; - if (!pboardobjgrp->bconstructed) + if (!pboardobjgrp->bconstructed) { return -EINVAL; + } status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); @@ -470,8 +481,9 @@ u32 volt_policy_sw_setup(struct gk20a *g) /* Obtain Voltage Rail Table from VBIOS */ status = volt_get_volt_policy_table(g, &g->perf_pmu.volt. volt_policy_metadata); - if (status) + if (status) { goto done; + } /* Populate data for the VOLT_RAIL PMU interface */ BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, VOLT, VOLT_POLICY); -- cgit v1.2.2