diff options
author | Philip Elcan <pelcan@nvidia.com> | 2018-08-29 15:46:12 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-07 00:33:50 -0400 |
commit | 7f8226887c28267d3c2351692d4429ead1e17695 (patch) | |
tree | aa09c45e496b058044c9d9a94c94d9922c572285 /drivers/gpu/nvgpu/perf/vfe_equ.c | |
parent | 0e58ebaae13dd59b6aba5297f898e7c89fcd2742 (diff) |
gpu: nvgpu: cleanup return types for MISRA 10.3
This is a big cleanup of return types across a number of modules in the
nvgpu driver. Many functions were returning u32 but using negative
return codes. This is a MISRA 10.3 violation by assigning signed values
to a u32.
JIRA NVGPU-647
Change-Id: I59ee66706321f5b5b1a07ed8c24b81583e9ba28c
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1810743
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/perf/vfe_equ.c')
-rw-r--r-- | drivers/gpu/nvgpu/perf/vfe_equ.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.c b/drivers/gpu/nvgpu/perf/vfe_equ.c index fa742c35..fdeee9a7 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.c +++ b/drivers/gpu/nvgpu/perf/vfe_equ.c | |||
@@ -31,14 +31,14 @@ | |||
31 | #include "ctrl/ctrlvolt.h" | 31 | #include "ctrl/ctrlvolt.h" |
32 | 32 | ||
33 | static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs); | 33 | static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs); |
34 | static u32 devinit_get_vfe_equ_table(struct gk20a *g, | 34 | static int devinit_get_vfe_equ_table(struct gk20a *g, |
35 | struct vfe_equs *pequobjs); | 35 | struct vfe_equs *pequobjs); |
36 | 36 | ||
37 | static u32 _vfe_equs_pmudatainit(struct gk20a *g, | 37 | static int _vfe_equs_pmudatainit(struct gk20a *g, |
38 | struct boardobjgrp *pboardobjgrp, | 38 | struct boardobjgrp *pboardobjgrp, |
39 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) | 39 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) |
40 | { | 40 | { |
41 | u32 status = 0; | 41 | int status = 0; |
42 | 42 | ||
43 | status = boardobjgrp_pmudatainit_e255(g, pboardobjgrp, pboardobjgrppmu); | 43 | status = boardobjgrp_pmudatainit_e255(g, pboardobjgrp, pboardobjgrppmu); |
44 | if (status) { | 44 | if (status) { |
@@ -51,7 +51,7 @@ done: | |||
51 | return status; | 51 | return status; |
52 | } | 52 | } |
53 | 53 | ||
54 | static u32 _vfe_equs_pmudata_instget(struct gk20a *g, | 54 | static int _vfe_equs_pmudata_instget(struct gk20a *g, |
55 | struct nv_pmu_boardobjgrp *pmuboardobjgrp, | 55 | struct nv_pmu_boardobjgrp *pmuboardobjgrp, |
56 | struct nv_pmu_boardobj **ppboardobjpmudata, | 56 | struct nv_pmu_boardobj **ppboardobjpmudata, |
57 | u8 idx) | 57 | u8 idx) |
@@ -71,9 +71,9 @@ static u32 _vfe_equs_pmudata_instget(struct gk20a *g, | |||
71 | return 0; | 71 | return 0; |
72 | } | 72 | } |
73 | 73 | ||
74 | u32 vfe_equ_sw_setup(struct gk20a *g) | 74 | int vfe_equ_sw_setup(struct gk20a *g) |
75 | { | 75 | { |
76 | u32 status; | 76 | int status; |
77 | struct boardobjgrp *pboardobjgrp = NULL; | 77 | struct boardobjgrp *pboardobjgrp = NULL; |
78 | struct vfe_equs *pvfeequobjs; | 78 | struct vfe_equs *pvfeequobjs; |
79 | 79 | ||
@@ -113,9 +113,9 @@ done: | |||
113 | return status; | 113 | return status; |
114 | } | 114 | } |
115 | 115 | ||
116 | u32 vfe_equ_pmu_setup(struct gk20a *g) | 116 | int vfe_equ_pmu_setup(struct gk20a *g) |
117 | { | 117 | { |
118 | u32 status; | 118 | int status; |
119 | struct boardobjgrp *pboardobjgrp = NULL; | 119 | struct boardobjgrp *pboardobjgrp = NULL; |
120 | 120 | ||
121 | nvgpu_log_info(g, " "); | 121 | nvgpu_log_info(g, " "); |
@@ -131,10 +131,10 @@ u32 vfe_equ_pmu_setup(struct gk20a *g) | |||
131 | return status; | 131 | return status; |
132 | } | 132 | } |
133 | 133 | ||
134 | static u32 devinit_get_vfe_equ_table(struct gk20a *g, | 134 | static int devinit_get_vfe_equ_table(struct gk20a *g, |
135 | struct vfe_equs *pvfeequobjs) | 135 | struct vfe_equs *pvfeequobjs) |
136 | { | 136 | { |
137 | u32 status = 0; | 137 | int status = 0; |
138 | u8 *vfeequs_tbl_ptr = NULL; | 138 | u8 *vfeequs_tbl_ptr = NULL; |
139 | struct vbios_vfe_3x_header_struct vfeequs_tbl_header = { 0 }; | 139 | struct vbios_vfe_3x_header_struct vfeequs_tbl_header = { 0 }; |
140 | struct vbios_vfe_3x_equ_entry_struct equ = { 0 }; | 140 | struct vbios_vfe_3x_equ_entry_struct equ = { 0 }; |
@@ -329,7 +329,7 @@ done: | |||
329 | return status; | 329 | return status; |
330 | } | 330 | } |
331 | 331 | ||
332 | static u32 _vfe_equ_pmudatainit_super(struct gk20a *g, | 332 | static int _vfe_equ_pmudatainit_super(struct gk20a *g, |
333 | struct boardobj *board_obj_ptr, | 333 | struct boardobj *board_obj_ptr, |
334 | struct nv_pmu_boardobj *ppmudata) | 334 | struct nv_pmu_boardobj *ppmudata) |
335 | { | 335 | { |
@@ -357,13 +357,13 @@ static u32 _vfe_equ_pmudatainit_super(struct gk20a *g, | |||
357 | return status; | 357 | return status; |
358 | } | 358 | } |
359 | 359 | ||
360 | static u32 vfe_equ_construct_super(struct gk20a *g, | 360 | static int vfe_equ_construct_super(struct gk20a *g, |
361 | struct boardobj **ppboardobj, | 361 | struct boardobj **ppboardobj, |
362 | u16 size, void *pargs) | 362 | u16 size, void *pargs) |
363 | { | 363 | { |
364 | struct vfe_equ *pvfeequ; | 364 | struct vfe_equ *pvfeequ; |
365 | struct vfe_equ *ptmpequ = (struct vfe_equ *)pargs; | 365 | struct vfe_equ *ptmpequ = (struct vfe_equ *)pargs; |
366 | u32 status = 0; | 366 | int status = 0; |
367 | 367 | ||
368 | status = boardobj_construct_super(g, ppboardobj, | 368 | status = boardobj_construct_super(g, ppboardobj, |
369 | size, pargs); | 369 | size, pargs); |
@@ -384,11 +384,11 @@ static u32 vfe_equ_construct_super(struct gk20a *g, | |||
384 | return status; | 384 | return status; |
385 | } | 385 | } |
386 | 386 | ||
387 | static u32 _vfe_equ_pmudatainit_compare(struct gk20a *g, | 387 | static int _vfe_equ_pmudatainit_compare(struct gk20a *g, |
388 | struct boardobj *board_obj_ptr, | 388 | struct boardobj *board_obj_ptr, |
389 | struct nv_pmu_boardobj *ppmudata) | 389 | struct nv_pmu_boardobj *ppmudata) |
390 | { | 390 | { |
391 | u32 status = 0; | 391 | int status = 0; |
392 | struct vfe_equ_compare *pvfe_equ_compare; | 392 | struct vfe_equ_compare *pvfe_equ_compare; |
393 | struct nv_pmu_vfe_equ_compare *pset; | 393 | struct nv_pmu_vfe_equ_compare *pset; |
394 | 394 | ||
@@ -411,7 +411,7 @@ static u32 _vfe_equ_pmudatainit_compare(struct gk20a *g, | |||
411 | } | 411 | } |
412 | 412 | ||
413 | 413 | ||
414 | static u32 vfe_equ_construct_compare(struct gk20a *g, | 414 | static int vfe_equ_construct_compare(struct gk20a *g, |
415 | struct boardobj **ppboardobj, | 415 | struct boardobj **ppboardobj, |
416 | u16 size, void *pargs) | 416 | u16 size, void *pargs) |
417 | { | 417 | { |
@@ -419,7 +419,7 @@ static u32 vfe_equ_construct_compare(struct gk20a *g, | |||
419 | struct vfe_equ_compare *pvfeequ; | 419 | struct vfe_equ_compare *pvfeequ; |
420 | struct vfe_equ_compare *ptmpequ = | 420 | struct vfe_equ_compare *ptmpequ = |
421 | (struct vfe_equ_compare *)pargs; | 421 | (struct vfe_equ_compare *)pargs; |
422 | u32 status = 0; | 422 | int status = 0; |
423 | 423 | ||
424 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_COMPARE) | 424 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_COMPARE) |
425 | return -EINVAL; | 425 | return -EINVAL; |
@@ -443,11 +443,11 @@ static u32 vfe_equ_construct_compare(struct gk20a *g, | |||
443 | return status; | 443 | return status; |
444 | } | 444 | } |
445 | 445 | ||
446 | static u32 _vfe_equ_pmudatainit_minmax(struct gk20a *g, | 446 | static int _vfe_equ_pmudatainit_minmax(struct gk20a *g, |
447 | struct boardobj *board_obj_ptr, | 447 | struct boardobj *board_obj_ptr, |
448 | struct nv_pmu_boardobj *ppmudata) | 448 | struct nv_pmu_boardobj *ppmudata) |
449 | { | 449 | { |
450 | u32 status = 0; | 450 | int status = 0; |
451 | struct vfe_equ_minmax *pvfe_equ_minmax; | 451 | struct vfe_equ_minmax *pvfe_equ_minmax; |
452 | struct nv_pmu_vfe_equ_minmax *pset; | 452 | struct nv_pmu_vfe_equ_minmax *pset; |
453 | 453 | ||
@@ -469,7 +469,7 @@ static u32 _vfe_equ_pmudatainit_minmax(struct gk20a *g, | |||
469 | return status; | 469 | return status; |
470 | } | 470 | } |
471 | 471 | ||
472 | static u32 vfe_equ_construct_minmax(struct gk20a *g, | 472 | static int vfe_equ_construct_minmax(struct gk20a *g, |
473 | struct boardobj **ppboardobj, | 473 | struct boardobj **ppboardobj, |
474 | u16 size, void *pargs) | 474 | u16 size, void *pargs) |
475 | { | 475 | { |
@@ -477,7 +477,7 @@ static u32 vfe_equ_construct_minmax(struct gk20a *g, | |||
477 | struct vfe_equ_minmax *pvfeequ; | 477 | struct vfe_equ_minmax *pvfeequ; |
478 | struct vfe_equ_minmax *ptmpequ = | 478 | struct vfe_equ_minmax *ptmpequ = |
479 | (struct vfe_equ_minmax *)pargs; | 479 | (struct vfe_equ_minmax *)pargs; |
480 | u32 status = 0; | 480 | int status = 0; |
481 | 481 | ||
482 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_MINMAX) | 482 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_MINMAX) |
483 | return -EINVAL; | 483 | return -EINVAL; |
@@ -498,11 +498,11 @@ static u32 vfe_equ_construct_minmax(struct gk20a *g, | |||
498 | return status; | 498 | return status; |
499 | } | 499 | } |
500 | 500 | ||
501 | static u32 _vfe_equ_pmudatainit_quadratic(struct gk20a *g, | 501 | static int _vfe_equ_pmudatainit_quadratic(struct gk20a *g, |
502 | struct boardobj *board_obj_ptr, | 502 | struct boardobj *board_obj_ptr, |
503 | struct nv_pmu_boardobj *ppmudata) | 503 | struct nv_pmu_boardobj *ppmudata) |
504 | { | 504 | { |
505 | u32 status = 0; | 505 | int status = 0; |
506 | struct vfe_equ_quadratic *pvfe_equ_quadratic; | 506 | struct vfe_equ_quadratic *pvfe_equ_quadratic; |
507 | struct nv_pmu_vfe_equ_quadratic *pset; | 507 | struct nv_pmu_vfe_equ_quadratic *pset; |
508 | u32 i; | 508 | u32 i; |
@@ -524,7 +524,7 @@ static u32 _vfe_equ_pmudatainit_quadratic(struct gk20a *g, | |||
524 | return status; | 524 | return status; |
525 | } | 525 | } |
526 | 526 | ||
527 | static u32 vfe_equ_construct_quadratic(struct gk20a *g, | 527 | static int vfe_equ_construct_quadratic(struct gk20a *g, |
528 | struct boardobj **ppboardobj, | 528 | struct boardobj **ppboardobj, |
529 | u16 size, void *pargs) | 529 | u16 size, void *pargs) |
530 | { | 530 | { |
@@ -532,7 +532,7 @@ static u32 vfe_equ_construct_quadratic(struct gk20a *g, | |||
532 | struct vfe_equ_quadratic *pvfeequ; | 532 | struct vfe_equ_quadratic *pvfeequ; |
533 | struct vfe_equ_quadratic *ptmpequ = | 533 | struct vfe_equ_quadratic *ptmpequ = |
534 | (struct vfe_equ_quadratic *)pargs; | 534 | (struct vfe_equ_quadratic *)pargs; |
535 | u32 status = 0; | 535 | int status = 0; |
536 | u32 i; | 536 | u32 i; |
537 | 537 | ||
538 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_QUADRATIC) | 538 | if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_QUADRATIC) |
@@ -558,7 +558,7 @@ static u32 vfe_equ_construct_quadratic(struct gk20a *g, | |||
558 | static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs) | 558 | static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs) |
559 | { | 559 | { |
560 | struct boardobj *board_obj_ptr = NULL; | 560 | struct boardobj *board_obj_ptr = NULL; |
561 | u32 status; | 561 | int status; |
562 | 562 | ||
563 | nvgpu_log_info(g, " "); | 563 | nvgpu_log_info(g, " "); |
564 | 564 | ||