diff options
author | smadhavan <smadhavan@nvidia.com> | 2018-09-06 04:38:00 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-12 08:36:04 -0400 |
commit | c7a3b6db10900e0aabc29ca7307908875d685036 (patch) | |
tree | 1ee88207c5149344841b1423d0cb920498f844b0 /drivers/gpu/nvgpu/perf/vfe_var.c | |
parent | c615002d22b4675d08404eb7cc7087d4418eccdb (diff) |
gpu: nvgpu: 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: I8046a09fa7ffc74c3d737ba57132a0a9ae2ff195
Signed-off-by: smadhavan <smadhavan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1797699
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
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/perf/vfe_var.c')
-rw-r--r-- | drivers/gpu/nvgpu/perf/vfe_var.c | 92 |
1 files changed, 60 insertions, 32 deletions
diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/perf/vfe_var.c index 5f6e9de7..9be069b0 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.c +++ b/drivers/gpu/nvgpu/perf/vfe_var.c | |||
@@ -72,8 +72,9 @@ static int _vfe_vars_pmudata_instget(struct gk20a *g, | |||
72 | nvgpu_log_info(g, " "); | 72 | nvgpu_log_info(g, " "); |
73 | 73 | ||
74 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ | 74 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ |
75 | if (idx >= CTRL_BOARDOBJGRP_E32_MAX_OBJECTS) | 75 | if (idx >= CTRL_BOARDOBJGRP_E32_MAX_OBJECTS) { |
76 | return -EINVAL; | 76 | return -EINVAL; |
77 | } | ||
77 | 78 | ||
78 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) | 79 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) |
79 | &pgrp_set->objects[idx].data.board_obj; | 80 | &pgrp_set->objects[idx].data.board_obj; |
@@ -90,8 +91,9 @@ static int _vfe_vars_pmustatus_instget(struct gk20a *g, void *pboardobjgrppmu, | |||
90 | pboardobjgrppmu; | 91 | pboardobjgrppmu; |
91 | 92 | ||
92 | if (((u32)BIT(idx) & | 93 | if (((u32)BIT(idx) & |
93 | pgrp_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) | 94 | pgrp_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) { |
94 | return -EINVAL; | 95 | return -EINVAL; |
96 | } | ||
95 | 97 | ||
96 | *ppboardobjpmustatus = (struct nv_pmu_boardobj_query *) | 98 | *ppboardobjpmustatus = (struct nv_pmu_boardobj_query *) |
97 | &pgrp_get_status->objects[idx].data.board_obj; | 99 | &pgrp_get_status->objects[idx].data.board_obj; |
@@ -134,8 +136,9 @@ int vfe_var_sw_setup(struct gk20a *g) | |||
134 | pboardobjgrp->pmustatusinstget = _vfe_vars_pmustatus_instget; | 136 | pboardobjgrp->pmustatusinstget = _vfe_vars_pmustatus_instget; |
135 | 137 | ||
136 | status = devinit_get_vfe_var_table(g, pvfevarobjs); | 138 | status = devinit_get_vfe_var_table(g, pvfevarobjs); |
137 | if (status) | 139 | if (status) { |
138 | goto done; | 140 | goto done; |
141 | } | ||
139 | 142 | ||
140 | status = BOARDOBJGRP_PMU_CMD_GRP_GET_STATUS_CONSTRUCT(g, | 143 | status = BOARDOBJGRP_PMU_CMD_GRP_GET_STATUS_CONSTRUCT(g, |
141 | &g->perf_pmu.vfe_varobjs.super.super, | 144 | &g->perf_pmu.vfe_varobjs.super.super, |
@@ -161,8 +164,9 @@ int vfe_var_pmu_setup(struct gk20a *g) | |||
161 | 164 | ||
162 | pboardobjgrp = &g->perf_pmu.vfe_varobjs.super.super; | 165 | pboardobjgrp = &g->perf_pmu.vfe_varobjs.super.super; |
163 | 166 | ||
164 | if (!pboardobjgrp->bconstructed) | 167 | if (!pboardobjgrp->bconstructed) { |
165 | return -EINVAL; | 168 | return -EINVAL; |
169 | } | ||
166 | 170 | ||
167 | status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); | 171 | status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); |
168 | 172 | ||
@@ -304,8 +308,9 @@ static int _vfe_var_pmudatainit_super(struct gk20a *g, | |||
304 | nvgpu_log_info(g, " "); | 308 | nvgpu_log_info(g, " "); |
305 | 309 | ||
306 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); | 310 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); |
307 | if (status != 0) | 311 | if (status != 0) { |
308 | return status; | 312 | return status; |
313 | } | ||
309 | 314 | ||
310 | pvfe_var = (struct vfe_var *)board_obj_ptr; | 315 | pvfe_var = (struct vfe_var *)board_obj_ptr; |
311 | pset = (struct nv_pmu_vfe_var *) ppmudata; | 316 | pset = (struct nv_pmu_vfe_var *) ppmudata; |
@@ -332,8 +337,9 @@ static int vfe_var_construct_super(struct gk20a *g, | |||
332 | nvgpu_log_info(g, " "); | 337 | nvgpu_log_info(g, " "); |
333 | 338 | ||
334 | status = boardobj_construct_super(g, ppboardobj, size, pargs); | 339 | status = boardobj_construct_super(g, ppboardobj, size, pargs); |
335 | if (status) | 340 | if (status) { |
336 | return -EINVAL; | 341 | return -EINVAL; |
342 | } | ||
337 | 343 | ||
338 | pvfevar = (struct vfe_var *)*ppboardobj; | 344 | pvfevar = (struct vfe_var *)*ppboardobj; |
339 | 345 | ||
@@ -373,8 +379,9 @@ static int vfe_var_construct_derived(struct gk20a *g, | |||
373 | 379 | ||
374 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED); | 380 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED); |
375 | status = vfe_var_construct_super(g, ppboardobj, size, pargs); | 381 | status = vfe_var_construct_super(g, ppboardobj, size, pargs); |
376 | if (status) | 382 | if (status) { |
377 | return -EINVAL; | 383 | return -EINVAL; |
384 | } | ||
378 | 385 | ||
379 | pvfevar = (struct vfe_var_derived *)*ppboardobj; | 386 | pvfevar = (struct vfe_var_derived *)*ppboardobj; |
380 | 387 | ||
@@ -395,8 +402,9 @@ static int _vfe_var_pmudatainit_derived_product(struct gk20a *g, | |||
395 | nvgpu_log_info(g, " "); | 402 | nvgpu_log_info(g, " "); |
396 | 403 | ||
397 | status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); | 404 | status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); |
398 | if (status != 0) | 405 | if (status != 0) { |
399 | return status; | 406 | return status; |
407 | } | ||
400 | 408 | ||
401 | pvfe_var_derived_product = | 409 | pvfe_var_derived_product = |
402 | (struct vfe_var_derived_product *)board_obj_ptr; | 410 | (struct vfe_var_derived_product *)board_obj_ptr; |
@@ -418,13 +426,15 @@ static int vfe_var_construct_derived_product(struct gk20a *g, | |||
418 | (struct vfe_var_derived_product *)pargs; | 426 | (struct vfe_var_derived_product *)pargs; |
419 | int status = 0; | 427 | int status = 0; |
420 | 428 | ||
421 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT) | 429 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT) { |
422 | return -EINVAL; | 430 | return -EINVAL; |
431 | } | ||
423 | 432 | ||
424 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT); | 433 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT); |
425 | status = vfe_var_construct_derived(g, ppboardobj, size, pargs); | 434 | status = vfe_var_construct_derived(g, ppboardobj, size, pargs); |
426 | if (status) | 435 | if (status) { |
427 | return -EINVAL; | 436 | return -EINVAL; |
437 | } | ||
428 | 438 | ||
429 | pvfevar = (struct vfe_var_derived_product *)*ppboardobj; | 439 | pvfevar = (struct vfe_var_derived_product *)*ppboardobj; |
430 | 440 | ||
@@ -449,8 +459,9 @@ static int _vfe_var_pmudatainit_derived_sum(struct gk20a *g, | |||
449 | nvgpu_log_info(g, " "); | 459 | nvgpu_log_info(g, " "); |
450 | 460 | ||
451 | status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); | 461 | status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); |
452 | if (status != 0) | 462 | if (status != 0) { |
453 | return status; | 463 | return status; |
464 | } | ||
454 | 465 | ||
455 | pvfe_var_derived_sum = (struct vfe_var_derived_sum *)board_obj_ptr; | 466 | pvfe_var_derived_sum = (struct vfe_var_derived_sum *)board_obj_ptr; |
456 | pset = (struct nv_pmu_vfe_var_derived_sum *)ppmudata; | 467 | pset = (struct nv_pmu_vfe_var_derived_sum *)ppmudata; |
@@ -471,13 +482,15 @@ static int vfe_var_construct_derived_sum(struct gk20a *g, | |||
471 | (struct vfe_var_derived_sum *)pargs; | 482 | (struct vfe_var_derived_sum *)pargs; |
472 | int status = 0; | 483 | int status = 0; |
473 | 484 | ||
474 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM) | 485 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM) { |
475 | return -EINVAL; | 486 | return -EINVAL; |
487 | } | ||
476 | 488 | ||
477 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM); | 489 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM); |
478 | status = vfe_var_construct_derived(g, ppboardobj, size, pargs); | 490 | status = vfe_var_construct_derived(g, ppboardobj, size, pargs); |
479 | if (status) | 491 | if (status) { |
480 | return -EINVAL; | 492 | return -EINVAL; |
493 | } | ||
481 | 494 | ||
482 | pvfevar = (struct vfe_var_derived_sum *)*ppboardobj; | 495 | pvfevar = (struct vfe_var_derived_sum *)*ppboardobj; |
483 | 496 | ||
@@ -501,8 +514,9 @@ static int _vfe_var_pmudatainit_single(struct gk20a *g, | |||
501 | nvgpu_log_info(g, " "); | 514 | nvgpu_log_info(g, " "); |
502 | 515 | ||
503 | status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata); | 516 | status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata); |
504 | if (status != 0) | 517 | if (status != 0) { |
505 | return status; | 518 | return status; |
519 | } | ||
506 | 520 | ||
507 | pvfe_var_single = (struct vfe_var_single *)board_obj_ptr; | 521 | pvfe_var_single = (struct vfe_var_single *)board_obj_ptr; |
508 | pset = (struct nv_pmu_vfe_var_single *) | 522 | pset = (struct nv_pmu_vfe_var_single *) |
@@ -537,13 +551,15 @@ static u32 vfe_var_construct_single_frequency(struct gk20a *g, | |||
537 | 551 | ||
538 | nvgpu_log_info(g, " "); | 552 | nvgpu_log_info(g, " "); |
539 | 553 | ||
540 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY) | 554 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY) { |
541 | return -EINVAL; | 555 | return -EINVAL; |
556 | } | ||
542 | 557 | ||
543 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY); | 558 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY); |
544 | status = vfe_var_construct_single(g, ppboardobj, size, pargs); | 559 | status = vfe_var_construct_single(g, ppboardobj, size, pargs); |
545 | if (status) | 560 | if (status) { |
546 | return -EINVAL; | 561 | return -EINVAL; |
562 | } | ||
547 | 563 | ||
548 | pvfevar = (struct vfe_var_single_frequency *)*ppboardobj; | 564 | pvfevar = (struct vfe_var_single_frequency *)*ppboardobj; |
549 | 565 | ||
@@ -581,8 +597,9 @@ static int _vfe_var_pmudatainit_single_sensed_fuse(struct gk20a *g, | |||
581 | nvgpu_log_info(g, " "); | 597 | nvgpu_log_info(g, " "); |
582 | 598 | ||
583 | status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); | 599 | status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); |
584 | if (status != 0) | 600 | if (status != 0) { |
585 | return status; | 601 | return status; |
602 | } | ||
586 | 603 | ||
587 | pvfe_var_single_sensed_fuse = | 604 | pvfe_var_single_sensed_fuse = |
588 | (struct vfe_var_single_sensed_fuse *)board_obj_ptr; | 605 | (struct vfe_var_single_sensed_fuse *)board_obj_ptr; |
@@ -618,8 +635,9 @@ static u32 vfe_var_construct_single_sensed(struct gk20a *g, | |||
618 | 635 | ||
619 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED); | 636 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED); |
620 | status = vfe_var_construct_single(g, ppboardobj, size, pargs); | 637 | status = vfe_var_construct_single(g, ppboardobj, size, pargs); |
621 | if (status) | 638 | if (status) { |
622 | return -EINVAL; | 639 | return -EINVAL; |
640 | } | ||
623 | 641 | ||
624 | pvfevar = (struct vfe_var_single_sensed *)*ppboardobj; | 642 | pvfevar = (struct vfe_var_single_sensed *)*ppboardobj; |
625 | 643 | ||
@@ -643,13 +661,15 @@ static u32 vfe_var_construct_single_sensed_fuse(struct gk20a *g, | |||
643 | 661 | ||
644 | nvgpu_log_info(g, " "); | 662 | nvgpu_log_info(g, " "); |
645 | 663 | ||
646 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE) | 664 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE) { |
647 | return -EINVAL; | 665 | return -EINVAL; |
666 | } | ||
648 | 667 | ||
649 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE); | 668 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE); |
650 | status = vfe_var_construct_single_sensed(g, ppboardobj, size, pargs); | 669 | status = vfe_var_construct_single_sensed(g, ppboardobj, size, pargs); |
651 | if (status) | 670 | if (status) { |
652 | return -EINVAL; | 671 | return -EINVAL; |
672 | } | ||
653 | 673 | ||
654 | pvfevar = (struct vfe_var_single_sensed_fuse *)*ppboardobj; | 674 | pvfevar = (struct vfe_var_single_sensed_fuse *)*ppboardobj; |
655 | 675 | ||
@@ -690,8 +710,9 @@ static u32 vfe_var_construct_single_sensed_fuse(struct gk20a *g, | |||
690 | goto exit; | 710 | goto exit; |
691 | } | 711 | } |
692 | exit: | 712 | exit: |
693 | if (status) | 713 | if (status) { |
694 | (*ppboardobj)->destruct(*ppboardobj); | 714 | (*ppboardobj)->destruct(*ppboardobj); |
715 | } | ||
695 | 716 | ||
696 | return status; | 717 | return status; |
697 | } | 718 | } |
@@ -707,8 +728,9 @@ static int _vfe_var_pmudatainit_single_sensed_temp(struct gk20a *g, | |||
707 | nvgpu_log_info(g, " "); | 728 | nvgpu_log_info(g, " "); |
708 | 729 | ||
709 | status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); | 730 | status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); |
710 | if (status != 0) | 731 | if (status != 0) { |
711 | return status; | 732 | return status; |
733 | } | ||
712 | 734 | ||
713 | pvfe_var_single_sensed_temp = | 735 | pvfe_var_single_sensed_temp = |
714 | (struct vfe_var_single_sensed_temp *)board_obj_ptr; | 736 | (struct vfe_var_single_sensed_temp *)board_obj_ptr; |
@@ -736,13 +758,15 @@ static u32 vfe_var_construct_single_sensed_temp(struct gk20a *g, | |||
736 | (struct vfe_var_single_sensed_temp *)pargs; | 758 | (struct vfe_var_single_sensed_temp *)pargs; |
737 | u32 status = 0; | 759 | u32 status = 0; |
738 | 760 | ||
739 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP) | 761 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP) { |
740 | return -EINVAL; | 762 | return -EINVAL; |
763 | } | ||
741 | 764 | ||
742 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP); | 765 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP); |
743 | status = vfe_var_construct_single_sensed(g, ppboardobj, size, pargs); | 766 | status = vfe_var_construct_single_sensed(g, ppboardobj, size, pargs); |
744 | if (status) | 767 | if (status) { |
745 | return -EINVAL; | 768 | return -EINVAL; |
769 | } | ||
746 | 770 | ||
747 | pvfevar = (struct vfe_var_single_sensed_temp *)*ppboardobj; | 771 | pvfevar = (struct vfe_var_single_sensed_temp *)*ppboardobj; |
748 | 772 | ||
@@ -784,13 +808,15 @@ static int vfe_var_construct_single_voltage(struct gk20a *g, | |||
784 | struct vfe_var_single_voltage *pvfevar; | 808 | struct vfe_var_single_voltage *pvfevar; |
785 | int status = 0; | 809 | int status = 0; |
786 | 810 | ||
787 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE) | 811 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE) { |
788 | return -EINVAL; | 812 | return -EINVAL; |
813 | } | ||
789 | 814 | ||
790 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE); | 815 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE); |
791 | status = vfe_var_construct_super(g, ppboardobj, size, pargs); | 816 | status = vfe_var_construct_super(g, ppboardobj, size, pargs); |
792 | if (status) | 817 | if (status) { |
793 | return -EINVAL; | 818 | return -EINVAL; |
819 | } | ||
794 | 820 | ||
795 | pvfevar = (struct vfe_var_single_voltage *)*ppboardobj; | 821 | pvfevar = (struct vfe_var_single_voltage *)*ppboardobj; |
796 | 822 | ||
@@ -847,8 +873,9 @@ static struct vfe_var *construct_vfe_var(struct gk20a *g, void *pargs) | |||
847 | return NULL; | 873 | return NULL; |
848 | } | 874 | } |
849 | 875 | ||
850 | if (status) | 876 | if (status) { |
851 | return NULL; | 877 | return NULL; |
878 | } | ||
852 | 879 | ||
853 | nvgpu_log_info(g, "done"); | 880 | nvgpu_log_info(g, "done"); |
854 | 881 | ||
@@ -896,12 +923,12 @@ static int devinit_get_vfe_var_table(struct gk20a *g, | |||
896 | } | 923 | } |
897 | 924 | ||
898 | if (vfevars_tbl_header.vfe_var_entry_size == | 925 | if (vfevars_tbl_header.vfe_var_entry_size == |
899 | VBIOS_VFE_3X_VAR_ENTRY_SIZE_19) | 926 | VBIOS_VFE_3X_VAR_ENTRY_SIZE_19) { |
900 | szfmt = VBIOS_VFE_3X_VAR_ENTRY_SIZE_19; | 927 | szfmt = VBIOS_VFE_3X_VAR_ENTRY_SIZE_19; |
901 | else if (vfevars_tbl_header.vfe_var_entry_size == | 928 | } else if (vfevars_tbl_header.vfe_var_entry_size == |
902 | VBIOS_VFE_3X_VAR_ENTRY_SIZE_11) | 929 | VBIOS_VFE_3X_VAR_ENTRY_SIZE_11) { |
903 | szfmt = VBIOS_VFE_3X_VAR_ENTRY_SIZE_11; | 930 | szfmt = VBIOS_VFE_3X_VAR_ENTRY_SIZE_11; |
904 | else { | 931 | } else { |
905 | status = -EINVAL; | 932 | status = -EINVAL; |
906 | goto done; | 933 | goto done; |
907 | } | 934 | } |
@@ -1047,8 +1074,9 @@ static int vfe_var_construct_single(struct gk20a *g, | |||
1047 | 1074 | ||
1048 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE); | 1075 | ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE); |
1049 | status = vfe_var_construct_super(g, ppboardobj, size, pargs); | 1076 | status = vfe_var_construct_super(g, ppboardobj, size, pargs); |
1050 | if (status) | 1077 | if (status) { |
1051 | return -EINVAL; | 1078 | return -EINVAL; |
1079 | } | ||
1052 | 1080 | ||
1053 | pvfevar = (struct vfe_var_single *)*ppboardobj; | 1081 | pvfevar = (struct vfe_var_single *)*ppboardobj; |
1054 | 1082 | ||