From 7f8226887c28267d3c2351692d4429ead1e17695 Mon Sep 17 00:00:00 2001 From: Philip Elcan Date: Wed, 29 Aug 2018 15:46:12 -0400 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1810743 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/volt/volt_dev.c | 30 +++++++++---------- drivers/gpu/nvgpu/volt/volt_dev.h | 4 +-- drivers/gpu/nvgpu/volt/volt_policy.c | 56 ++++++++++++++++++------------------ drivers/gpu/nvgpu/volt/volt_policy.h | 4 +-- drivers/gpu/nvgpu/volt/volt_rail.c | 22 +++++++------- drivers/gpu/nvgpu/volt/volt_rail.h | 4 +-- 6 files changed, 60 insertions(+), 60 deletions(-) (limited to 'drivers/gpu/nvgpu/volt') 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 @@ #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 #define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 -static u32 volt_device_pmu_data_init_super(struct gk20a *g, +static int volt_device_pmu_data_init_super(struct gk20a *g, struct boardobj *pboard_obj, struct nv_pmu_boardobj *ppmudata) { - u32 status; + int status; struct voltage_device *pdev; struct nv_pmu_volt_volt_device_boardobj_set *pset; @@ -61,10 +61,10 @@ static u32 volt_device_pmu_data_init_super(struct gk20a *g, return status; } -static u32 volt_device_pmu_data_init_pwm(struct gk20a *g, +static int volt_device_pmu_data_init_pwm(struct gk20a *g, struct boardobj *pboard_obj, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct voltage_device_pwm *pdev; struct nv_pmu_volt_volt_device_pwm_boardobj_set *pset; @@ -84,12 +84,12 @@ static u32 volt_device_pmu_data_init_pwm(struct gk20a *g, return status; } -static u32 construct_volt_device(struct gk20a *g, +static int construct_volt_device(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct voltage_device *ptmp_dev = (struct voltage_device *)pargs; struct voltage_device *pvolt_dev = NULL; - u32 status = 0; + int status = 0; status = boardobj_construct_super(g, ppboardobj, size, pargs); if (status) { @@ -113,7 +113,7 @@ static u32 construct_volt_device(struct gk20a *g, return status; } -static u32 construct_pwm_volt_device(struct gk20a *g, +static int construct_pwm_volt_device(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -121,7 +121,7 @@ static u32 construct_pwm_volt_device(struct gk20a *g, struct voltage_device_pwm *ptmp_dev = (struct voltage_device_pwm *)pargs; struct voltage_device_pwm *pdev = NULL; - u32 status = 0; + int status = 0; status = construct_volt_device(g, ppboardobj, size, pargs); if (status) { @@ -186,7 +186,7 @@ static struct voltage_device *volt_volt_device_construct(struct gk20a *g, struct boardobj *pboard_obj = NULL; if (BOARDOBJ_GET_TYPE(pargs) == CTRL_VOLT_DEVICE_TYPE_PWM) { - u32 status = construct_pwm_volt_device(g, &pboard_obj, + int status = construct_pwm_volt_device(g, &pboard_obj, sizeof(struct voltage_device_pwm), pargs); if (status) { nvgpu_err(g, @@ -199,12 +199,12 @@ static struct voltage_device *volt_volt_device_construct(struct gk20a *g, return (struct voltage_device *)pboard_obj; } -static u32 volt_get_voltage_device_table_1x_psv(struct gk20a *g, +static int volt_get_voltage_device_table_1x_psv(struct gk20a *g, struct vbios_voltage_device_table_1x_entry *p_bios_entry, struct voltage_device_metadata *p_Volt_Device_Meta_Data, u8 entry_Idx) { - u32 status = 0; + int status = 0; u32 entry_cnt = 0; struct voltage_device *pvolt_dev = NULL; struct voltage_device_pwm *pvolt_dev_pwm = NULL; @@ -413,7 +413,7 @@ done: return status; } -static u32 _volt_device_devgrp_pmudata_instget(struct gk20a *g, +static int _volt_device_devgrp_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) { @@ -435,7 +435,7 @@ static u32 _volt_device_devgrp_pmudata_instget(struct gk20a *g, return 0; } -static u32 _volt_device_devgrp_pmustatus_instget(struct gk20a *g, +static int _volt_device_devgrp_pmustatus_instget(struct gk20a *g, void *pboardobjgrppmu, struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) { @@ -518,9 +518,9 @@ done: return status; } -u32 volt_dev_pmu_setup(struct gk20a *g) +int volt_dev_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; 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 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -73,6 +73,6 @@ struct voltage_device_pwm_entry { /* PWM end */ u32 volt_dev_sw_setup(struct gk20a *g); -u32 volt_dev_pmu_setup(struct gk20a *g); +int volt_dev_pmu_setup(struct gk20a *g); #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 @@ #include "volt.h" -static u32 volt_policy_pmu_data_init_super(struct gk20a *g, +static int volt_policy_pmu_data_init_super(struct gk20a *g, struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata) { return boardobj_pmudatainit_super(g, pboardobj, ppmudata); } -static u32 construct_volt_policy(struct gk20a *g, +static int construct_volt_policy(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pArgs) { struct voltage_policy *pvolt_policy = NULL; - u32 status = 0; + int status = 0; status = boardobj_construct_super(g, ppboardobj, size, pArgs); if (status) { @@ -54,13 +54,13 @@ static u32 construct_volt_policy(struct gk20a *g, return status; } -static u32 construct_volt_policy_split_rail(struct gk20a *g, +static int construct_volt_policy_split_rail(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pArgs) { struct voltage_policy_split_rail *ptmp_policy = (struct voltage_policy_split_rail *)pArgs; struct voltage_policy_split_rail *pvolt_policy = NULL; - u32 status = 0; + int status = 0; status = construct_volt_policy(g, ppboardobj, size, pArgs); if (status) { @@ -79,13 +79,13 @@ static u32 construct_volt_policy_split_rail(struct gk20a *g, return status; } -static u32 construct_volt_policy_single_rail(struct gk20a *g, +static int construct_volt_policy_single_rail(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pArgs) { struct voltage_policy_single_rail *ptmp_policy = (struct voltage_policy_single_rail *)pArgs; struct voltage_policy_single_rail *pvolt_policy = NULL; - u32 status = 0; + int status = 0; status = construct_volt_policy(g, ppboardobj, size, pArgs); if (status) { @@ -99,10 +99,10 @@ static u32 construct_volt_policy_single_rail(struct gk20a *g, return status; } -static u32 volt_policy_pmu_data_init_single_rail(struct gk20a *g, +static int volt_policy_pmu_data_init_single_rail(struct gk20a *g, struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct voltage_policy_single_rail *ppolicy; struct nv_pmu_volt_volt_policy_sr_boardobj_set *pset; @@ -120,10 +120,10 @@ done: return status; } -static u32 volt_policy_pmu_data_init_sr_multi_step(struct gk20a *g, +static int volt_policy_pmu_data_init_sr_multi_step(struct gk20a *g, struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct voltage_policy_single_rail_multi_step *ppolicy; struct nv_pmu_volt_volt_policy_sr_multi_step_boardobj_set *pset; @@ -144,14 +144,14 @@ done: return status; } -static u32 volt_construct_volt_policy_single_rail_multi_step(struct gk20a *g, +static int volt_construct_volt_policy_single_rail_multi_step(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct boardobj *pboardobj = NULL; struct voltage_policy_single_rail_multi_step *p_volt_policy = NULL; struct voltage_policy_single_rail_multi_step *tmp_policy = (struct voltage_policy_single_rail_multi_step *)pargs; - u32 status = 0; + int status = 0; status = construct_volt_policy_single_rail(g, ppboardobj, size, pargs); if (status) { @@ -174,10 +174,10 @@ static u32 volt_construct_volt_policy_single_rail_multi_step(struct gk20a *g, return status; } -static u32 volt_policy_pmu_data_init_split_rail(struct gk20a *g, +static int volt_policy_pmu_data_init_split_rail(struct gk20a *g, struct boardobj *pboardobj, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct voltage_policy_split_rail *ppolicy; struct nv_pmu_volt_volt_policy_splt_r_boardobj_set *pset; @@ -201,11 +201,11 @@ done: return status; } -static u32 volt_construct_volt_policy_split_rail_single_step(struct gk20a *g, +static int volt_construct_volt_policy_split_rail_single_step(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct boardobj *pboardobj = NULL; - u32 status = 0; + int status = 0; status = construct_volt_policy_split_rail(g, ppboardobj, size, pargs); if (status) { @@ -221,7 +221,7 @@ static u32 volt_construct_volt_policy_split_rail_single_step(struct gk20a *g, static struct voltage_policy *volt_volt_policy_construct(struct gk20a *g, void *pargs) { struct boardobj *pboard_obj = NULL; - u32 status = 0; + int status = 0; switch (BOARDOBJ_GET_TYPE(pargs)) { case CTRL_VOLT_POLICY_TYPE_SR_SINGLE_STEP: @@ -269,10 +269,10 @@ static u8 volt_policy_type_convert(u8 vbios_type) return CTRL_VOLT_POLICY_TYPE_INVALID; } -static u32 volt_get_volt_policy_table(struct gk20a *g, +static int volt_get_volt_policy_table(struct gk20a *g, struct voltage_policy_metadata *pvolt_policy_metadata) { - u32 status = 0; + int status = 0; u8 *voltage_policy_table_ptr = NULL; struct voltage_policy *ppolicy = NULL; struct vbios_voltage_policy_table_1x_header header = { 0 }; @@ -370,7 +370,7 @@ static u32 volt_get_volt_policy_table(struct gk20a *g, done: return status; } -static u32 _volt_policy_devgrp_pmudata_instget(struct gk20a *g, +static int _volt_policy_devgrp_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) { @@ -392,7 +392,7 @@ static u32 _volt_policy_devgrp_pmudata_instget(struct gk20a *g, return 0; } -static u32 _volt_policy_devgrp_pmustatus_instget(struct gk20a *g, +static int _volt_policy_devgrp_pmustatus_instget(struct gk20a *g, void *pboardobjgrppmu, struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) { @@ -411,7 +411,7 @@ static u32 _volt_policy_devgrp_pmustatus_instget(struct gk20a *g, return 0; } -static u32 _volt_policy_grp_pmudatainit_super(struct gk20a *g, +static int _volt_policy_grp_pmudatainit_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) { @@ -419,7 +419,7 @@ static u32 _volt_policy_grp_pmudatainit_super(struct gk20a *g, (struct nv_pmu_volt_volt_policy_boardobjgrp_set_header *) pboardobjgrppmu; struct obj_volt *volt = (struct obj_volt *)pboardobjgrp; - u32 status = 0; + int status = 0; status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); if (status) { @@ -435,9 +435,9 @@ done: return status; } -u32 volt_policy_pmu_setup(struct gk20a *g) +int volt_policy_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -455,9 +455,9 @@ u32 volt_policy_pmu_setup(struct gk20a *g) return status; } -u32 volt_policy_sw_setup(struct gk20a *g) +int volt_policy_sw_setup(struct gk20a *g) { - u32 status = 0; + int status = 0; struct boardobjgrp *pboardobjgrp = NULL; 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 { u32 ramp_down_step_size_uv; }; -u32 volt_policy_sw_setup(struct gk20a *g); -u32 volt_policy_pmu_setup(struct gk20a *g); +int volt_policy_sw_setup(struct gk20a *g); +int volt_policy_pmu_setup(struct gk20a *g); #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, return status; } -static u32 volt_rail_init_pmudata_super(struct gk20a *g, +static int volt_rail_init_pmudata_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct voltage_rail *prail; struct nv_pmu_volt_volt_rail_boardobj_set *rail_pmu_data; u32 i; @@ -183,7 +183,7 @@ static struct voltage_rail *construct_volt_rail(struct gk20a *g, void *pargs) struct boardobj *board_obj_ptr = NULL; struct voltage_rail *ptemp_rail = (struct voltage_rail *)pargs; struct voltage_rail *board_obj_volt_rail_ptr = NULL; - u32 status; + int status; nvgpu_log_info(g, " "); status = boardobj_construct_super(g, &board_obj_ptr, @@ -242,9 +242,9 @@ u8 volt_rail_vbios_volt_domain_convert_to_internal(struct gk20a *g, return CTRL_VOLT_DOMAIN_INVALID; } -u32 volt_rail_pmu_setup(struct gk20a *g) +int volt_rail_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -261,10 +261,10 @@ u32 volt_rail_pmu_setup(struct gk20a *g) return status; } -static u32 volt_get_volt_rail_table(struct gk20a *g, +static int volt_get_volt_rail_table(struct gk20a *g, struct voltage_rail_metadata *pvolt_rail_metadata) { - u32 status = 0; + int status = 0; u8 *volt_rail_table_ptr = NULL; struct voltage_rail *prail = NULL; struct vbios_voltage_rail_table_1x_header header = { 0 }; @@ -370,7 +370,7 @@ done: return status; } -static u32 _volt_rail_devgrp_pmudata_instget(struct gk20a *g, +static int _volt_rail_devgrp_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) { @@ -392,7 +392,7 @@ static u32 _volt_rail_devgrp_pmudata_instget(struct gk20a *g, return 0; } -static u32 _volt_rail_devgrp_pmustatus_instget(struct gk20a *g, +static int _volt_rail_devgrp_pmustatus_instget(struct gk20a *g, void *pboardobjgrppmu, struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) { @@ -411,9 +411,9 @@ static u32 _volt_rail_devgrp_pmustatus_instget(struct gk20a *g, return 0; } -u32 volt_rail_sw_setup(struct gk20a *g) +int volt_rail_sw_setup(struct gk20a *g) { - u32 status = 0; + int status = 0; struct boardobjgrp *pboardobjgrp = NULL; struct voltage_rail *pvolt_rail; 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 u8 volt_rail_volt_domain_convert_to_idx(struct gk20a *g, u8 volt_domain); -u32 volt_rail_sw_setup(struct gk20a *g); -u32 volt_rail_pmu_setup(struct gk20a *g); +int volt_rail_sw_setup(struct gk20a *g); +int volt_rail_pmu_setup(struct gk20a *g); #endif -- cgit v1.2.2