diff options
author | Srirangan <smadhavan@nvidia.com> | 2018-09-04 07:16:40 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-05 23:41:06 -0400 |
commit | 3b413d58fa349eca1da9577359546c39effa2c8c (patch) | |
tree | 2bb45c9253fb6a5a18afa6d1c12ffeca79effd8e /drivers/gpu/nvgpu/volt/volt_policy.c | |
parent | 7405cd9a6dcd22d04f48be07be4839c735994ada (diff) |
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 <smadhavan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1812421
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/volt/volt_policy.c')
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_policy.c | 36 |
1 files changed, 24 insertions, 12 deletions
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, | |||
43 | u32 status = 0; | 43 | u32 status = 0; |
44 | 44 | ||
45 | status = boardobj_construct_super(g, ppboardobj, size, pArgs); | 45 | status = boardobj_construct_super(g, ppboardobj, size, pArgs); |
46 | if (status) | 46 | if (status) { |
47 | return status; | 47 | return status; |
48 | } | ||
48 | 49 | ||
49 | pvolt_policy = (struct voltage_policy *)*ppboardobj; | 50 | pvolt_policy = (struct voltage_policy *)*ppboardobj; |
50 | 51 | ||
@@ -62,8 +63,9 @@ static u32 construct_volt_policy_split_rail(struct gk20a *g, | |||
62 | u32 status = 0; | 63 | u32 status = 0; |
63 | 64 | ||
64 | status = construct_volt_policy(g, ppboardobj, size, pArgs); | 65 | status = construct_volt_policy(g, ppboardobj, size, pArgs); |
65 | if (status) | 66 | if (status) { |
66 | return status; | 67 | return status; |
68 | } | ||
67 | 69 | ||
68 | pvolt_policy = (struct voltage_policy_split_rail *)*ppboardobj; | 70 | pvolt_policy = (struct voltage_policy_split_rail *)*ppboardobj; |
69 | 71 | ||
@@ -86,8 +88,9 @@ static u32 construct_volt_policy_single_rail(struct gk20a *g, | |||
86 | u32 status = 0; | 88 | u32 status = 0; |
87 | 89 | ||
88 | status = construct_volt_policy(g, ppboardobj, size, pArgs); | 90 | status = construct_volt_policy(g, ppboardobj, size, pArgs); |
89 | if (status) | 91 | if (status) { |
90 | return status; | 92 | return status; |
93 | } | ||
91 | 94 | ||
92 | pvolt_policy = (struct voltage_policy_single_rail *)*ppboardobj; | 95 | pvolt_policy = (struct voltage_policy_single_rail *)*ppboardobj; |
93 | 96 | ||
@@ -104,8 +107,9 @@ static u32 volt_policy_pmu_data_init_single_rail(struct gk20a *g, | |||
104 | struct nv_pmu_volt_volt_policy_sr_boardobj_set *pset; | 107 | struct nv_pmu_volt_volt_policy_sr_boardobj_set *pset; |
105 | 108 | ||
106 | status = volt_policy_pmu_data_init_super(g, pboardobj, ppmudata); | 109 | status = volt_policy_pmu_data_init_super(g, pboardobj, ppmudata); |
107 | if (status) | 110 | if (status) { |
108 | goto done; | 111 | goto done; |
112 | } | ||
109 | 113 | ||
110 | ppolicy = (struct voltage_policy_single_rail *)pboardobj; | 114 | ppolicy = (struct voltage_policy_single_rail *)pboardobj; |
111 | pset = (struct nv_pmu_volt_volt_policy_sr_boardobj_set *) | 115 | 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, | |||
124 | struct nv_pmu_volt_volt_policy_sr_multi_step_boardobj_set *pset; | 128 | struct nv_pmu_volt_volt_policy_sr_multi_step_boardobj_set *pset; |
125 | 129 | ||
126 | status = volt_policy_pmu_data_init_single_rail(g, pboardobj, ppmudata); | 130 | status = volt_policy_pmu_data_init_single_rail(g, pboardobj, ppmudata); |
127 | if (status) | 131 | if (status) { |
128 | goto done; | 132 | goto done; |
133 | } | ||
129 | 134 | ||
130 | ppolicy = (struct voltage_policy_single_rail_multi_step *)pboardobj; | 135 | ppolicy = (struct voltage_policy_single_rail_multi_step *)pboardobj; |
131 | pset = (struct nv_pmu_volt_volt_policy_sr_multi_step_boardobj_set *) | 136 | 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, | |||
149 | u32 status = 0; | 154 | u32 status = 0; |
150 | 155 | ||
151 | status = construct_volt_policy_single_rail(g, ppboardobj, size, pargs); | 156 | status = construct_volt_policy_single_rail(g, ppboardobj, size, pargs); |
152 | if (status) | 157 | if (status) { |
153 | return status; | 158 | return status; |
159 | } | ||
154 | 160 | ||
155 | pboardobj = (*ppboardobj); | 161 | pboardobj = (*ppboardobj); |
156 | p_volt_policy = (struct voltage_policy_single_rail_multi_step *) | 162 | 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, | |||
176 | struct nv_pmu_volt_volt_policy_splt_r_boardobj_set *pset; | 182 | struct nv_pmu_volt_volt_policy_splt_r_boardobj_set *pset; |
177 | 183 | ||
178 | status = volt_policy_pmu_data_init_super(g, pboardobj, ppmudata); | 184 | status = volt_policy_pmu_data_init_super(g, pboardobj, ppmudata); |
179 | if (status) | 185 | if (status) { |
180 | goto done; | 186 | goto done; |
187 | } | ||
181 | 188 | ||
182 | ppolicy = (struct voltage_policy_split_rail *)pboardobj; | 189 | ppolicy = (struct voltage_policy_split_rail *)pboardobj; |
183 | pset = (struct nv_pmu_volt_volt_policy_splt_r_boardobj_set *) | 190 | 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, | |||
201 | u32 status = 0; | 208 | u32 status = 0; |
202 | 209 | ||
203 | status = construct_volt_policy_split_rail(g, ppboardobj, size, pargs); | 210 | status = construct_volt_policy_split_rail(g, ppboardobj, size, pargs); |
204 | if (status) | 211 | if (status) { |
205 | return status; | 212 | return status; |
213 | } | ||
206 | 214 | ||
207 | pboardobj = (*ppboardobj); | 215 | pboardobj = (*ppboardobj); |
208 | pboardobj->pmudatainit = volt_policy_pmu_data_init_split_rail; | 216 | pboardobj->pmudatainit = volt_policy_pmu_data_init_split_rail; |
@@ -374,8 +382,9 @@ static u32 _volt_policy_devgrp_pmudata_instget(struct gk20a *g, | |||
374 | 382 | ||
375 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ | 383 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ |
376 | if (((u32)BIT(idx) & | 384 | if (((u32)BIT(idx) & |
377 | pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) | 385 | pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) { |
378 | return -EINVAL; | 386 | return -EINVAL; |
387 | } | ||
379 | 388 | ||
380 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) | 389 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) |
381 | &pgrp_set->objects[idx].data.board_obj; | 390 | &pgrp_set->objects[idx].data.board_obj; |
@@ -393,8 +402,9 @@ static u32 _volt_policy_devgrp_pmustatus_instget(struct gk20a *g, | |||
393 | 402 | ||
394 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ | 403 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ |
395 | if (((u32)BIT(idx) & | 404 | if (((u32)BIT(idx) & |
396 | p_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) | 405 | p_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) { |
397 | return -EINVAL; | 406 | return -EINVAL; |
407 | } | ||
398 | 408 | ||
399 | *ppboardobjpmustatus = (struct nv_pmu_boardobj_query *) | 409 | *ppboardobjpmustatus = (struct nv_pmu_boardobj_query *) |
400 | &p_get_status->objects[idx].data.board_obj; | 410 | &p_get_status->objects[idx].data.board_obj; |
@@ -435,8 +445,9 @@ u32 volt_policy_pmu_setup(struct gk20a *g) | |||
435 | pboardobjgrp = | 445 | pboardobjgrp = |
436 | &g->perf_pmu.volt.volt_policy_metadata.volt_policies.super; | 446 | &g->perf_pmu.volt.volt_policy_metadata.volt_policies.super; |
437 | 447 | ||
438 | if (!pboardobjgrp->bconstructed) | 448 | if (!pboardobjgrp->bconstructed) { |
439 | return -EINVAL; | 449 | return -EINVAL; |
450 | } | ||
440 | 451 | ||
441 | status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); | 452 | status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); |
442 | 453 | ||
@@ -470,8 +481,9 @@ u32 volt_policy_sw_setup(struct gk20a *g) | |||
470 | /* Obtain Voltage Rail Table from VBIOS */ | 481 | /* Obtain Voltage Rail Table from VBIOS */ |
471 | status = volt_get_volt_policy_table(g, &g->perf_pmu.volt. | 482 | status = volt_get_volt_policy_table(g, &g->perf_pmu.volt. |
472 | volt_policy_metadata); | 483 | volt_policy_metadata); |
473 | if (status) | 484 | if (status) { |
474 | goto done; | 485 | goto done; |
486 | } | ||
475 | 487 | ||
476 | /* Populate data for the VOLT_RAIL PMU interface */ | 488 | /* Populate data for the VOLT_RAIL PMU interface */ |
477 | BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, VOLT, VOLT_POLICY); | 489 | BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, VOLT, VOLT_POLICY); |