summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/volt
diff options
context:
space:
mode:
authorPhilip Elcan <pelcan@nvidia.com>2018-08-29 15:46:12 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-07 00:33:50 -0400
commit7f8226887c28267d3c2351692d4429ead1e17695 (patch)
treeaa09c45e496b058044c9d9a94c94d9922c572285 /drivers/gpu/nvgpu/volt
parent0e58ebaae13dd59b6aba5297f898e7c89fcd2742 (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/volt')
-rw-r--r--drivers/gpu/nvgpu/volt/volt_dev.c30
-rw-r--r--drivers/gpu/nvgpu/volt/volt_dev.h4
-rw-r--r--drivers/gpu/nvgpu/volt/volt_policy.c56
-rw-r--r--drivers/gpu/nvgpu/volt/volt_policy.h4
-rw-r--r--drivers/gpu/nvgpu/volt/volt_rail.c22
-rw-r--r--drivers/gpu/nvgpu/volt/volt_rail.h4
6 files changed, 60 insertions, 60 deletions
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c
index 728b0eaf..b6e69a37 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.c
+++ b/drivers/gpu/nvgpu/volt/volt_dev.c
@@ -38,10 +38,10 @@
38#define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 38#define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0
39#define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 39#define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1
40 40
41static u32 volt_device_pmu_data_init_super(struct gk20a *g, 41static int volt_device_pmu_data_init_super(struct gk20a *g,
42 struct boardobj *pboard_obj, struct nv_pmu_boardobj *ppmudata) 42 struct boardobj *pboard_obj, struct nv_pmu_boardobj *ppmudata)
43{ 43{
44 u32 status; 44 int status;
45 struct voltage_device *pdev; 45 struct voltage_device *pdev;
46 struct nv_pmu_volt_volt_device_boardobj_set *pset; 46 struct nv_pmu_volt_volt_device_boardobj_set *pset;
47 47
@@ -61,10 +61,10 @@ static u32 volt_device_pmu_data_init_super(struct gk20a *g,
61 return status; 61 return status;
62} 62}
63 63
64static u32 volt_device_pmu_data_init_pwm(struct gk20a *g, 64static int volt_device_pmu_data_init_pwm(struct gk20a *g,
65 struct boardobj *pboard_obj, struct nv_pmu_boardobj *ppmudata) 65 struct boardobj *pboard_obj, struct nv_pmu_boardobj *ppmudata)
66{ 66{
67 u32 status = 0; 67 int status = 0;
68 struct voltage_device_pwm *pdev; 68 struct voltage_device_pwm *pdev;
69 struct nv_pmu_volt_volt_device_pwm_boardobj_set *pset; 69 struct nv_pmu_volt_volt_device_pwm_boardobj_set *pset;
70 70
@@ -84,12 +84,12 @@ static u32 volt_device_pmu_data_init_pwm(struct gk20a *g,
84 return status; 84 return status;
85} 85}
86 86
87static u32 construct_volt_device(struct gk20a *g, 87static int construct_volt_device(struct gk20a *g,
88 struct boardobj **ppboardobj, u16 size, void *pargs) 88 struct boardobj **ppboardobj, u16 size, void *pargs)
89{ 89{
90 struct voltage_device *ptmp_dev = (struct voltage_device *)pargs; 90 struct voltage_device *ptmp_dev = (struct voltage_device *)pargs;
91 struct voltage_device *pvolt_dev = NULL; 91 struct voltage_device *pvolt_dev = NULL;
92 u32 status = 0; 92 int status = 0;
93 93
94 status = boardobj_construct_super(g, ppboardobj, size, pargs); 94 status = boardobj_construct_super(g, ppboardobj, size, pargs);
95 if (status) { 95 if (status) {
@@ -113,7 +113,7 @@ static u32 construct_volt_device(struct gk20a *g,
113 return status; 113 return status;
114} 114}
115 115
116static u32 construct_pwm_volt_device(struct gk20a *g, 116static int construct_pwm_volt_device(struct gk20a *g,
117 struct boardobj **ppboardobj, 117 struct boardobj **ppboardobj,
118 u16 size, void *pargs) 118 u16 size, void *pargs)
119{ 119{
@@ -121,7 +121,7 @@ static u32 construct_pwm_volt_device(struct gk20a *g,
121 struct voltage_device_pwm *ptmp_dev = 121 struct voltage_device_pwm *ptmp_dev =
122 (struct voltage_device_pwm *)pargs; 122 (struct voltage_device_pwm *)pargs;
123 struct voltage_device_pwm *pdev = NULL; 123 struct voltage_device_pwm *pdev = NULL;
124 u32 status = 0; 124 int status = 0;
125 125
126 status = construct_volt_device(g, ppboardobj, size, pargs); 126 status = construct_volt_device(g, ppboardobj, size, pargs);
127 if (status) { 127 if (status) {
@@ -186,7 +186,7 @@ static struct voltage_device *volt_volt_device_construct(struct gk20a *g,
186 struct boardobj *pboard_obj = NULL; 186 struct boardobj *pboard_obj = NULL;
187 187
188 if (BOARDOBJ_GET_TYPE(pargs) == CTRL_VOLT_DEVICE_TYPE_PWM) { 188 if (BOARDOBJ_GET_TYPE(pargs) == CTRL_VOLT_DEVICE_TYPE_PWM) {
189 u32 status = construct_pwm_volt_device(g, &pboard_obj, 189 int status = construct_pwm_volt_device(g, &pboard_obj,
190 sizeof(struct voltage_device_pwm), pargs); 190 sizeof(struct voltage_device_pwm), pargs);
191 if (status) { 191 if (status) {
192 nvgpu_err(g, 192 nvgpu_err(g,
@@ -199,12 +199,12 @@ static struct voltage_device *volt_volt_device_construct(struct gk20a *g,
199 return (struct voltage_device *)pboard_obj; 199 return (struct voltage_device *)pboard_obj;
200} 200}
201 201
202static u32 volt_get_voltage_device_table_1x_psv(struct gk20a *g, 202static int volt_get_voltage_device_table_1x_psv(struct gk20a *g,
203 struct vbios_voltage_device_table_1x_entry *p_bios_entry, 203 struct vbios_voltage_device_table_1x_entry *p_bios_entry,
204 struct voltage_device_metadata *p_Volt_Device_Meta_Data, 204 struct voltage_device_metadata *p_Volt_Device_Meta_Data,
205 u8 entry_Idx) 205 u8 entry_Idx)
206{ 206{
207 u32 status = 0; 207 int status = 0;
208 u32 entry_cnt = 0; 208 u32 entry_cnt = 0;
209 struct voltage_device *pvolt_dev = NULL; 209 struct voltage_device *pvolt_dev = NULL;
210 struct voltage_device_pwm *pvolt_dev_pwm = NULL; 210 struct voltage_device_pwm *pvolt_dev_pwm = NULL;
@@ -413,7 +413,7 @@ done:
413 return status; 413 return status;
414} 414}
415 415
416static u32 _volt_device_devgrp_pmudata_instget(struct gk20a *g, 416static int _volt_device_devgrp_pmudata_instget(struct gk20a *g,
417 struct nv_pmu_boardobjgrp *pmuboardobjgrp, 417 struct nv_pmu_boardobjgrp *pmuboardobjgrp,
418 struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) 418 struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx)
419{ 419{
@@ -435,7 +435,7 @@ static u32 _volt_device_devgrp_pmudata_instget(struct gk20a *g,
435 return 0; 435 return 0;
436} 436}
437 437
438static u32 _volt_device_devgrp_pmustatus_instget(struct gk20a *g, 438static int _volt_device_devgrp_pmustatus_instget(struct gk20a *g,
439 void *pboardobjgrppmu, 439 void *pboardobjgrppmu,
440 struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) 440 struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx)
441{ 441{
@@ -518,9 +518,9 @@ done:
518 return status; 518 return status;
519} 519}
520 520
521u32 volt_dev_pmu_setup(struct gk20a *g) 521int volt_dev_pmu_setup(struct gk20a *g)
522{ 522{
523 u32 status; 523 int status;
524 struct boardobjgrp *pboardobjgrp = NULL; 524 struct boardobjgrp *pboardobjgrp = NULL;
525 525
526 nvgpu_log_info(g, " "); 526 nvgpu_log_info(g, " ");
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.h b/drivers/gpu/nvgpu/volt/volt_dev.h
index a3dc8cf6..98f3bce9 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.h
+++ b/drivers/gpu/nvgpu/volt/volt_dev.h
@@ -1,5 +1,5 @@
1/* 1/*
2* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 2* Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved.
3* 3*
4 * Permission is hereby granted, free of charge, to any person obtaining a 4 * Permission is hereby granted, free of charge, to any person obtaining a
5 * copy of this software and associated documentation files (the "Software"), 5 * copy of this software and associated documentation files (the "Software"),
@@ -73,6 +73,6 @@ struct voltage_device_pwm_entry {
73/* PWM end */ 73/* PWM end */
74 74
75u32 volt_dev_sw_setup(struct gk20a *g); 75u32 volt_dev_sw_setup(struct gk20a *g);
76u32 volt_dev_pmu_setup(struct gk20a *g); 76int volt_dev_pmu_setup(struct gk20a *g);
77 77
78#endif /* _VOLTDEV_H_ */ 78#endif /* _VOLTDEV_H_ */
diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c
index 4c8737d3..e4b081a1 100644
--- a/drivers/gpu/nvgpu/volt/volt_policy.c
+++ b/drivers/gpu/nvgpu/volt/volt_policy.c
@@ -30,17 +30,17 @@
30 30
31#include "volt.h" 31#include "volt.h"
32 32
33static u32 volt_policy_pmu_data_init_super(struct gk20a *g, 33static int volt_policy_pmu_data_init_super(struct gk20a *g,
34 struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata) 34 struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata)
35{ 35{
36 return boardobj_pmudatainit_super(g, pboardobj, ppmudata); 36 return boardobj_pmudatainit_super(g, pboardobj, ppmudata);
37} 37}
38 38
39static u32 construct_volt_policy(struct gk20a *g, 39static int construct_volt_policy(struct gk20a *g,
40 struct boardobj **ppboardobj, u16 size, void *pArgs) 40 struct boardobj **ppboardobj, u16 size, void *pArgs)
41{ 41{
42 struct voltage_policy *pvolt_policy = NULL; 42 struct voltage_policy *pvolt_policy = NULL;
43 u32 status = 0; 43 int 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) {
@@ -54,13 +54,13 @@ static u32 construct_volt_policy(struct gk20a *g,
54 return status; 54 return status;
55} 55}
56 56
57static u32 construct_volt_policy_split_rail(struct gk20a *g, 57static int construct_volt_policy_split_rail(struct gk20a *g,
58 struct boardobj **ppboardobj, u16 size, void *pArgs) 58 struct boardobj **ppboardobj, u16 size, void *pArgs)
59{ 59{
60 struct voltage_policy_split_rail *ptmp_policy = 60 struct voltage_policy_split_rail *ptmp_policy =
61 (struct voltage_policy_split_rail *)pArgs; 61 (struct voltage_policy_split_rail *)pArgs;
62 struct voltage_policy_split_rail *pvolt_policy = NULL; 62 struct voltage_policy_split_rail *pvolt_policy = NULL;
63 u32 status = 0; 63 int status = 0;
64 64
65 status = construct_volt_policy(g, ppboardobj, size, pArgs); 65 status = construct_volt_policy(g, ppboardobj, size, pArgs);
66 if (status) { 66 if (status) {
@@ -79,13 +79,13 @@ static u32 construct_volt_policy_split_rail(struct gk20a *g,
79 return status; 79 return status;
80} 80}
81 81
82static u32 construct_volt_policy_single_rail(struct gk20a *g, 82static int construct_volt_policy_single_rail(struct gk20a *g,
83 struct boardobj **ppboardobj, u16 size, void *pArgs) 83 struct boardobj **ppboardobj, u16 size, void *pArgs)
84{ 84{
85 struct voltage_policy_single_rail *ptmp_policy = 85 struct voltage_policy_single_rail *ptmp_policy =
86 (struct voltage_policy_single_rail *)pArgs; 86 (struct voltage_policy_single_rail *)pArgs;
87 struct voltage_policy_single_rail *pvolt_policy = NULL; 87 struct voltage_policy_single_rail *pvolt_policy = NULL;
88 u32 status = 0; 88 int status = 0;
89 89
90 status = construct_volt_policy(g, ppboardobj, size, pArgs); 90 status = construct_volt_policy(g, ppboardobj, size, pArgs);
91 if (status) { 91 if (status) {
@@ -99,10 +99,10 @@ static u32 construct_volt_policy_single_rail(struct gk20a *g,
99 return status; 99 return status;
100} 100}
101 101
102static u32 volt_policy_pmu_data_init_single_rail(struct gk20a *g, 102static int volt_policy_pmu_data_init_single_rail(struct gk20a *g,
103 struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata) 103 struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata)
104{ 104{
105 u32 status = 0; 105 int status = 0;
106 struct voltage_policy_single_rail *ppolicy; 106 struct voltage_policy_single_rail *ppolicy;
107 struct nv_pmu_volt_volt_policy_sr_boardobj_set *pset; 107 struct nv_pmu_volt_volt_policy_sr_boardobj_set *pset;
108 108
@@ -120,10 +120,10 @@ done:
120 return status; 120 return status;
121} 121}
122 122
123static u32 volt_policy_pmu_data_init_sr_multi_step(struct gk20a *g, 123static int volt_policy_pmu_data_init_sr_multi_step(struct gk20a *g,
124 struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata) 124 struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata)
125{ 125{
126 u32 status = 0; 126 int status = 0;
127 struct voltage_policy_single_rail_multi_step *ppolicy; 127 struct voltage_policy_single_rail_multi_step *ppolicy;
128 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;
129 129
@@ -144,14 +144,14 @@ done:
144 return status; 144 return status;
145} 145}
146 146
147static u32 volt_construct_volt_policy_single_rail_multi_step(struct gk20a *g, 147static int volt_construct_volt_policy_single_rail_multi_step(struct gk20a *g,
148 struct boardobj **ppboardobj, u16 size, void *pargs) 148 struct boardobj **ppboardobj, u16 size, void *pargs)
149{ 149{
150 struct boardobj *pboardobj = NULL; 150 struct boardobj *pboardobj = NULL;
151 struct voltage_policy_single_rail_multi_step *p_volt_policy = NULL; 151 struct voltage_policy_single_rail_multi_step *p_volt_policy = NULL;
152 struct voltage_policy_single_rail_multi_step *tmp_policy = 152 struct voltage_policy_single_rail_multi_step *tmp_policy =
153 (struct voltage_policy_single_rail_multi_step *)pargs; 153 (struct voltage_policy_single_rail_multi_step *)pargs;
154 u32 status = 0; 154 int status = 0;
155 155
156 status = construct_volt_policy_single_rail(g, ppboardobj, size, pargs); 156 status = construct_volt_policy_single_rail(g, ppboardobj, size, pargs);
157 if (status) { 157 if (status) {
@@ -174,10 +174,10 @@ static u32 volt_construct_volt_policy_single_rail_multi_step(struct gk20a *g,
174 return status; 174 return status;
175} 175}
176 176
177static u32 volt_policy_pmu_data_init_split_rail(struct gk20a *g, 177static int volt_policy_pmu_data_init_split_rail(struct gk20a *g,
178 struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata) 178 struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata)
179{ 179{
180 u32 status = 0; 180 int status = 0;
181 struct voltage_policy_split_rail *ppolicy; 181 struct voltage_policy_split_rail *ppolicy;
182 struct nv_pmu_volt_volt_policy_splt_r_boardobj_set *pset; 182 struct nv_pmu_volt_volt_policy_splt_r_boardobj_set *pset;
183 183
@@ -201,11 +201,11 @@ done:
201 return status; 201 return status;
202} 202}
203 203
204static u32 volt_construct_volt_policy_split_rail_single_step(struct gk20a *g, 204static int volt_construct_volt_policy_split_rail_single_step(struct gk20a *g,
205 struct boardobj **ppboardobj, u16 size, void *pargs) 205 struct boardobj **ppboardobj, u16 size, void *pargs)
206{ 206{
207 struct boardobj *pboardobj = NULL; 207 struct boardobj *pboardobj = NULL;
208 u32 status = 0; 208 int status = 0;
209 209
210 status = construct_volt_policy_split_rail(g, ppboardobj, size, pargs); 210 status = construct_volt_policy_split_rail(g, ppboardobj, size, pargs);
211 if (status) { 211 if (status) {
@@ -221,7 +221,7 @@ static u32 volt_construct_volt_policy_split_rail_single_step(struct gk20a *g,
221static struct voltage_policy *volt_volt_policy_construct(struct gk20a *g, void *pargs) 221static struct voltage_policy *volt_volt_policy_construct(struct gk20a *g, void *pargs)
222{ 222{
223 struct boardobj *pboard_obj = NULL; 223 struct boardobj *pboard_obj = NULL;
224 u32 status = 0; 224 int status = 0;
225 225
226 switch (BOARDOBJ_GET_TYPE(pargs)) { 226 switch (BOARDOBJ_GET_TYPE(pargs)) {
227 case CTRL_VOLT_POLICY_TYPE_SR_SINGLE_STEP: 227 case CTRL_VOLT_POLICY_TYPE_SR_SINGLE_STEP:
@@ -269,10 +269,10 @@ static u8 volt_policy_type_convert(u8 vbios_type)
269 return CTRL_VOLT_POLICY_TYPE_INVALID; 269 return CTRL_VOLT_POLICY_TYPE_INVALID;
270} 270}
271 271
272static u32 volt_get_volt_policy_table(struct gk20a *g, 272static int volt_get_volt_policy_table(struct gk20a *g,
273 struct voltage_policy_metadata *pvolt_policy_metadata) 273 struct voltage_policy_metadata *pvolt_policy_metadata)
274{ 274{
275 u32 status = 0; 275 int status = 0;
276 u8 *voltage_policy_table_ptr = NULL; 276 u8 *voltage_policy_table_ptr = NULL;
277 struct voltage_policy *ppolicy = NULL; 277 struct voltage_policy *ppolicy = NULL;
278 struct vbios_voltage_policy_table_1x_header header = { 0 }; 278 struct vbios_voltage_policy_table_1x_header header = { 0 };
@@ -370,7 +370,7 @@ static u32 volt_get_volt_policy_table(struct gk20a *g,
370done: 370done:
371 return status; 371 return status;
372} 372}
373static u32 _volt_policy_devgrp_pmudata_instget(struct gk20a *g, 373static int _volt_policy_devgrp_pmudata_instget(struct gk20a *g,
374 struct nv_pmu_boardobjgrp *pmuboardobjgrp, 374 struct nv_pmu_boardobjgrp *pmuboardobjgrp,
375 struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) 375 struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx)
376{ 376{
@@ -392,7 +392,7 @@ static u32 _volt_policy_devgrp_pmudata_instget(struct gk20a *g,
392 return 0; 392 return 0;
393} 393}
394 394
395static u32 _volt_policy_devgrp_pmustatus_instget(struct gk20a *g, 395static int _volt_policy_devgrp_pmustatus_instget(struct gk20a *g,
396 void *pboardobjgrppmu, 396 void *pboardobjgrppmu,
397 struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) 397 struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx)
398{ 398{
@@ -411,7 +411,7 @@ static u32 _volt_policy_devgrp_pmustatus_instget(struct gk20a *g,
411 return 0; 411 return 0;
412} 412}
413 413
414static u32 _volt_policy_grp_pmudatainit_super(struct gk20a *g, 414static int _volt_policy_grp_pmudatainit_super(struct gk20a *g,
415 struct boardobjgrp *pboardobjgrp, 415 struct boardobjgrp *pboardobjgrp,
416 struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) 416 struct nv_pmu_boardobjgrp_super *pboardobjgrppmu)
417{ 417{
@@ -419,7 +419,7 @@ static u32 _volt_policy_grp_pmudatainit_super(struct gk20a *g,
419 (struct nv_pmu_volt_volt_policy_boardobjgrp_set_header *) 419 (struct nv_pmu_volt_volt_policy_boardobjgrp_set_header *)
420 pboardobjgrppmu; 420 pboardobjgrppmu;
421 struct obj_volt *volt = (struct obj_volt *)pboardobjgrp; 421 struct obj_volt *volt = (struct obj_volt *)pboardobjgrp;
422 u32 status = 0; 422 int status = 0;
423 423
424 status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); 424 status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu);
425 if (status) { 425 if (status) {
@@ -435,9 +435,9 @@ done:
435 return status; 435 return status;
436} 436}
437 437
438u32 volt_policy_pmu_setup(struct gk20a *g) 438int volt_policy_pmu_setup(struct gk20a *g)
439{ 439{
440 u32 status; 440 int status;
441 struct boardobjgrp *pboardobjgrp = NULL; 441 struct boardobjgrp *pboardobjgrp = NULL;
442 442
443 nvgpu_log_info(g, " "); 443 nvgpu_log_info(g, " ");
@@ -455,9 +455,9 @@ u32 volt_policy_pmu_setup(struct gk20a *g)
455 return status; 455 return status;
456} 456}
457 457
458u32 volt_policy_sw_setup(struct gk20a *g) 458int volt_policy_sw_setup(struct gk20a *g)
459{ 459{
460 u32 status = 0; 460 int status = 0;
461 struct boardobjgrp *pboardobjgrp = NULL; 461 struct boardobjgrp *pboardobjgrp = NULL;
462 462
463 nvgpu_log_info(g, " "); 463 nvgpu_log_info(g, " ");
diff --git a/drivers/gpu/nvgpu/volt/volt_policy.h b/drivers/gpu/nvgpu/volt/volt_policy.h
index 34c8f0f6..af13e02f 100644
--- a/drivers/gpu/nvgpu/volt/volt_policy.h
+++ b/drivers/gpu/nvgpu/volt/volt_policy.h
@@ -75,6 +75,6 @@ struct voltage_policy_single_rail_multi_step {
75 u32 ramp_down_step_size_uv; 75 u32 ramp_down_step_size_uv;
76}; 76};
77 77
78u32 volt_policy_sw_setup(struct gk20a *g); 78int volt_policy_sw_setup(struct gk20a *g);
79u32 volt_policy_pmu_setup(struct gk20a *g); 79int volt_policy_pmu_setup(struct gk20a *g);
80#endif 80#endif
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c
index e44d8973..c8dc25f2 100644
--- a/drivers/gpu/nvgpu/volt/volt_rail.c
+++ b/drivers/gpu/nvgpu/volt/volt_rail.c
@@ -128,10 +128,10 @@ static u32 volt_rail_state_init(struct gk20a *g,
128 return status; 128 return status;
129} 129}
130 130
131static u32 volt_rail_init_pmudata_super(struct gk20a *g, 131static int volt_rail_init_pmudata_super(struct gk20a *g,
132 struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) 132 struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata)
133{ 133{
134 u32 status = 0; 134 int status = 0;
135 struct voltage_rail *prail; 135 struct voltage_rail *prail;
136 struct nv_pmu_volt_volt_rail_boardobj_set *rail_pmu_data; 136 struct nv_pmu_volt_volt_rail_boardobj_set *rail_pmu_data;
137 u32 i; 137 u32 i;
@@ -183,7 +183,7 @@ static struct voltage_rail *construct_volt_rail(struct gk20a *g, void *pargs)
183 struct boardobj *board_obj_ptr = NULL; 183 struct boardobj *board_obj_ptr = NULL;
184 struct voltage_rail *ptemp_rail = (struct voltage_rail *)pargs; 184 struct voltage_rail *ptemp_rail = (struct voltage_rail *)pargs;
185 struct voltage_rail *board_obj_volt_rail_ptr = NULL; 185 struct voltage_rail *board_obj_volt_rail_ptr = NULL;
186 u32 status; 186 int status;
187 187
188 nvgpu_log_info(g, " "); 188 nvgpu_log_info(g, " ");
189 status = boardobj_construct_super(g, &board_obj_ptr, 189 status = boardobj_construct_super(g, &board_obj_ptr,
@@ -242,9 +242,9 @@ u8 volt_rail_vbios_volt_domain_convert_to_internal(struct gk20a *g,
242 return CTRL_VOLT_DOMAIN_INVALID; 242 return CTRL_VOLT_DOMAIN_INVALID;
243} 243}
244 244
245u32 volt_rail_pmu_setup(struct gk20a *g) 245int volt_rail_pmu_setup(struct gk20a *g)
246{ 246{
247 u32 status; 247 int status;
248 struct boardobjgrp *pboardobjgrp = NULL; 248 struct boardobjgrp *pboardobjgrp = NULL;
249 249
250 nvgpu_log_info(g, " "); 250 nvgpu_log_info(g, " ");
@@ -261,10 +261,10 @@ u32 volt_rail_pmu_setup(struct gk20a *g)
261 return status; 261 return status;
262} 262}
263 263
264static u32 volt_get_volt_rail_table(struct gk20a *g, 264static int volt_get_volt_rail_table(struct gk20a *g,
265 struct voltage_rail_metadata *pvolt_rail_metadata) 265 struct voltage_rail_metadata *pvolt_rail_metadata)
266{ 266{
267 u32 status = 0; 267 int status = 0;
268 u8 *volt_rail_table_ptr = NULL; 268 u8 *volt_rail_table_ptr = NULL;
269 struct voltage_rail *prail = NULL; 269 struct voltage_rail *prail = NULL;
270 struct vbios_voltage_rail_table_1x_header header = { 0 }; 270 struct vbios_voltage_rail_table_1x_header header = { 0 };
@@ -370,7 +370,7 @@ done:
370 return status; 370 return status;
371} 371}
372 372
373static u32 _volt_rail_devgrp_pmudata_instget(struct gk20a *g, 373static int _volt_rail_devgrp_pmudata_instget(struct gk20a *g,
374 struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj 374 struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj
375 **ppboardobjpmudata, u8 idx) 375 **ppboardobjpmudata, u8 idx)
376{ 376{
@@ -392,7 +392,7 @@ static u32 _volt_rail_devgrp_pmudata_instget(struct gk20a *g,
392 return 0; 392 return 0;
393} 393}
394 394
395static u32 _volt_rail_devgrp_pmustatus_instget(struct gk20a *g, 395static int _volt_rail_devgrp_pmustatus_instget(struct gk20a *g,
396 void *pboardobjgrppmu, struct nv_pmu_boardobj_query 396 void *pboardobjgrppmu, struct nv_pmu_boardobj_query
397 **ppboardobjpmustatus, u8 idx) 397 **ppboardobjpmustatus, u8 idx)
398{ 398{
@@ -411,9 +411,9 @@ static u32 _volt_rail_devgrp_pmustatus_instget(struct gk20a *g,
411 return 0; 411 return 0;
412} 412}
413 413
414u32 volt_rail_sw_setup(struct gk20a *g) 414int volt_rail_sw_setup(struct gk20a *g)
415{ 415{
416 u32 status = 0; 416 int status = 0;
417 struct boardobjgrp *pboardobjgrp = NULL; 417 struct boardobjgrp *pboardobjgrp = NULL;
418 struct voltage_rail *pvolt_rail; 418 struct voltage_rail *pvolt_rail;
419 u8 i; 419 u8 i;
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.h b/drivers/gpu/nvgpu/volt/volt_rail.h
index be3cbb72..6c667eed 100644
--- a/drivers/gpu/nvgpu/volt/volt_rail.h
+++ b/drivers/gpu/nvgpu/volt/volt_rail.h
@@ -85,6 +85,6 @@ u32 volt_rail_volt_dev_register(struct gk20a *g, struct voltage_rail
85 85
86u8 volt_rail_volt_domain_convert_to_idx(struct gk20a *g, u8 volt_domain); 86u8 volt_rail_volt_domain_convert_to_idx(struct gk20a *g, u8 volt_domain);
87 87
88u32 volt_rail_sw_setup(struct gk20a *g); 88int volt_rail_sw_setup(struct gk20a *g);
89u32 volt_rail_pmu_setup(struct gk20a *g); 89int volt_rail_pmu_setup(struct gk20a *g);
90#endif 90#endif