diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c
index 67eeffd57..d57522afb 100644
--- a/drivers/gpu/nvgpu/clk/clk_vin.c
+++ b/drivers/gpu/nvgpu/clk/clk_vin.c
@@ -102,8 +102,8 @@ u32 clk_avfs_get_vin_cal_fuse_v20(struct gk20a *g,
 	if (pvinobjs->calibration_rev_vbios == g->ops.fuse.read_vin_cal_fuse_rev(g)) {
 		BOARDOBJGRP_FOR_EACH(&(pvinobjs->super.super),
 				     struct vin_device_v20 *, pvindev, i) {
-			gain = 0;
-			offset = 0;
+			gain = '\0';
+			offset = '\0';
 			pvindev = (struct vin_device_v20 *)CLK_GET_VIN_DEVICE(pvinobjs, i);
 			status = g->ops.fuse.read_vin_cal_gain_offset_fuse(g,
 					pvindev->super.id, &gain, &offset);
@@ -268,7 +268,7 @@ static u32 devinit_get_vin_device_table(struct gk20a *g,
 	u8 *vin_tbl_entry_ptr = NULL;
 	u32 index = 0;
 	u32 slope=0, intercept=0;
-	s8 offset=0, gain=0;
+	s8 offset='\0', gain='\0';
 	struct vin_device *pvin_dev;
 	u32 cal_type;
 
diff --git a/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c b/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c
index 17951e27c..47dc49abc 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;
 }
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
index a0b9013f4..9c487d6d7 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
@@ -169,7 +169,7 @@ int __nvgpu_alloc_common_init(struct nvgpu_allocator *a, struct gk20a *g,
 	a->debug = dbg;
 
 	strncpy(a->name, name, sizeof(a->name));
-	a->name[sizeof(a->name) - 1] = 0;
+	a->name[sizeof(a->name) - 1U] = '\0';
 
 	return 0;
 }
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index dcaf11b14..9ec4c8677 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -96,7 +96,7 @@ static void print_pmu_trace(struct nvgpu_pmu *pmu)
 			if (k >= 40)
 				break;
 			strncpy(part_str, (trace+i+20+m), k);
-			part_str[k] = 0;
+			part_str[k] = '\0';
 			count += scnprintf((buf + count), 0x40, "%s0x%x",
 					part_str, trace1[(i / 4) + 1 + l]);
 			l++;