From 05f45bcfc390c46f000f4c6b46546eebed869df6 Mon Sep 17 00:00:00 2001 From: Sai Nikhil Date: Tue, 21 Aug 2018 12:18:10 +0530 Subject: gpu: nvgpu: MISRA 10.3 Conversions to/from char MISRA Rule 10.3 states that the value of an expression shall not be assigned to an object with a narrower essential type or of a different essential type category. We have cases where we are converting to/from char and non char types and this fix 10.3 violations resulting from these conversions. This also fix violations in conversions between s8 and non-s8 types as s8 can be typedefed as char. Jira NVGPU-1010 Change-Id: I150dd633eb7575de9ea2bedd598b7af74d1fcbd9 Signed-off-by: Sai Nikhil Reviewed-on: https://git-master.nvidia.com/r/1801613 Reviewed-by: svc-misra-checker Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Adeel Raza Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/fuse/fuse_gp106.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'drivers/gpu/nvgpu/common/fuse/fuse_gp106.c') diff --git a/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c b/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c index 17951e27..47dc49ab 100644 --- a/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c +++ b/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c @@ -181,50 +181,54 @@ u32 gp106_fuse_read_vin_cal_gain_offset_fuse(struct gk20a *g, u32 vin_id, s8 *gain, s8 *offset) { + u32 reg_val = 0; u32 data = 0; switch (vin_id) { case CTRL_CLK_VIN_ID_GPC0: - data = gk20a_readl(g, fuse_vin_cal_gpc0_r()); + reg_val = gk20a_readl(g, fuse_vin_cal_gpc0_r()); break; case CTRL_CLK_VIN_ID_GPC1: - data = gk20a_readl(g, fuse_vin_cal_gpc1_delta_r()); + reg_val = gk20a_readl(g, fuse_vin_cal_gpc1_delta_r()); break; case CTRL_CLK_VIN_ID_GPC2: - data = gk20a_readl(g, fuse_vin_cal_gpc2_delta_r()); + reg_val = gk20a_readl(g, fuse_vin_cal_gpc2_delta_r()); break; case CTRL_CLK_VIN_ID_GPC3: - data = gk20a_readl(g, fuse_vin_cal_gpc3_delta_r()); + reg_val = gk20a_readl(g, fuse_vin_cal_gpc3_delta_r()); break; case CTRL_CLK_VIN_ID_GPC4: - data = gk20a_readl(g, fuse_vin_cal_gpc4_delta_r()); + reg_val = gk20a_readl(g, fuse_vin_cal_gpc4_delta_r()); break; case CTRL_CLK_VIN_ID_GPC5: - data = gk20a_readl(g, fuse_vin_cal_gpc5_delta_r()); + reg_val = gk20a_readl(g, fuse_vin_cal_gpc5_delta_r()); break; case CTRL_CLK_VIN_ID_SYS: case CTRL_CLK_VIN_ID_XBAR: case CTRL_CLK_VIN_ID_LTC: - data = gk20a_readl(g, fuse_vin_cal_shared_delta_r()); + reg_val = gk20a_readl(g, fuse_vin_cal_shared_delta_r()); break; case CTRL_CLK_VIN_ID_SRAM: - data = gk20a_readl(g, fuse_vin_cal_sram_delta_r()); + reg_val = gk20a_readl(g, fuse_vin_cal_sram_delta_r()); break; default: return -EINVAL; } - if (data == 0xFFFFFFFF) + if (reg_val == 0xFFFFFFFF) { return -EINVAL; - *gain = (s8) (data >> 16) & 0x1f; - *offset = (s8) data & 0x7f; + } + data = (reg_val >> 16U) & 0x1fU; + *gain = (s8)data; + data = reg_val & 0x7fU; + *offset = (s8)data; return 0; } -- cgit v1.2.2