diff --git a/drivers/gpu/nvgpu/common/pmu/clk/clk_fll.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_fll.c
index 0f3d839c4..76b91558c 100644
--- a/drivers/gpu/nvgpu/common/pmu/clk/clk_fll.c
+++ b/drivers/gpu/nvgpu/common/pmu/clk/clk_fll.c
@@ -430,7 +430,7 @@ static struct fll_device *construct_fll_device(struct gk20a *g,
 
 	nvgpu_log_info(g, " ");
 	status = boardobj_construct_super(g, &board_obj_ptr,
-		(u32)sizeof(struct fll_device), pargs);
+		sizeof(struct fll_device), pargs);
 	if (status != 0) {
 		return NULL;
 	}
diff --git a/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_controller.c
index 3fc6a4fe5..a7171789b 100644
--- a/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_controller.c
+++ b/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_controller.c
@@ -97,7 +97,7 @@ static int clk_freq_controller_pmudatainit_pi(struct gk20a *g,
 
 static int clk_freq_controller_construct_super(struct gk20a *g,
 	struct boardobj **ppboardobj,
-	u16 size, void *pargs)
+	size_t size, void *pargs)
 {
 	struct clk_freq_controller *pfreq_cntlr = NULL;
 	struct clk_freq_controller *pfreq_cntlr_tmp = NULL;
@@ -128,7 +128,7 @@ static int clk_freq_controller_construct_super(struct gk20a *g,
 
 static int clk_freq_controller_construct_pi(struct gk20a *g,
 	struct boardobj **ppboardobj,
-	u16 size, void *pargs)
+	size_t size, void *pargs)
 {
 	struct clk_freq_controller_pi *pfreq_cntlr_pi = NULL;
 	struct clk_freq_controller_pi *pfreq_cntlr_pi_tmp = NULL;
@@ -169,7 +169,7 @@ static struct clk_freq_controller *clk_clk_freq_controller_construct(
 	}
 
 	status = clk_freq_controller_construct_pi(g, &board_obj_ptr,
-			(u16)sizeof(struct clk_freq_controller_pi), pargs);
+			sizeof(struct clk_freq_controller_pi), pargs);
 	if (status != 0) {
 		return NULL;
 	}
diff --git a/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_domain.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_domain.c
index 5e2e55e06..fde643530 100644
--- a/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_domain.c
+++ b/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_domain.c
@@ -194,7 +194,7 @@ int nvgpu_clk_freq_domain_sw_setup(struct gk20a *g)
 
 		pboardobj = NULL;
 		status = boardobj_construct_super(g,&pboardobj,
-			(u16)sizeof(struct nvgpu_clk_freq_domain),
+			sizeof(struct nvgpu_clk_freq_domain),
 			(void*)&freq_domain_data);
 		if(status != 0) {
 			nvgpu_err(g, "Failed to construct nvgpu_clk_freq_domain Board obj");
diff --git a/drivers/gpu/nvgpu/common/pmu/clk/clk_prog.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_prog.c
index 553e2f350..da0c425bc 100644
--- a/drivers/gpu/nvgpu/common/pmu/clk/clk_prog.c
+++ b/drivers/gpu/nvgpu/common/pmu/clk/clk_prog.c
@@ -951,7 +951,7 @@ static int clk_prog_construct_super(struct gk20a *g,
 	int status = 0;
 
 	status = boardobj_construct_super(g, ppboardobj,
-		(u16)size, pargs);
+		size, pargs);
 	if (status != 0) {
 		return -EINVAL;
 	}
diff --git a/drivers/gpu/nvgpu/common/pmu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_vf_point.c
index f99e5a012..04243c309 100644
--- a/drivers/gpu/nvgpu/common/pmu/clk/clk_vf_point.c
+++ b/drivers/gpu/nvgpu/common/pmu/clk/clk_vf_point.c
@@ -163,7 +163,7 @@ int clk_vf_point_pmu_setup(struct gk20a *g)
 
 static int clk_vf_point_construct_super(struct gk20a *g,
 					struct boardobj **ppboardobj,
-					u16 size, void *pargs)
+					size_t size, void *pargs)
 {
 	struct clk_vf_point *pclkvfpoint;
 	struct clk_vf_point *ptmpvfpoint =
@@ -246,7 +246,7 @@ static int _clk_vf_point_pmudatainit_freq(struct gk20a *g,
 
 static int clk_vf_point_construct_volt(struct gk20a *g,
 				       struct boardobj **ppboardobj,
-				       u16 size, void *pargs)
+				       size_t size, void *pargs)
 {
 	struct boardobj *ptmpobj = (struct boardobj *)pargs;
 	struct clk_vf_point_volt *pclkvfpoint;
@@ -277,7 +277,7 @@ static int clk_vf_point_construct_volt(struct gk20a *g,
 
 static int clk_vf_point_construct_freq(struct gk20a *g,
 				       struct boardobj **ppboardobj,
-				       u16 size, void *pargs)
+				       size_t size, void *pargs)
 {
 	struct boardobj *ptmpobj = (struct boardobj *)pargs;
 	struct clk_vf_point_freq *pclkvfpoint;
@@ -308,7 +308,7 @@ static int clk_vf_point_construct_freq(struct gk20a *g,
 
 static int clk_vf_point_construct_volt_35(struct gk20a *g,
 				       struct boardobj **ppboardobj,
-				       u16 size, void *pargs)
+				       size_t size, void *pargs)
 {
 	struct boardobj *ptmpobj = (struct boardobj *)pargs;
 	struct clk_vf_point_volt *pclkvfpoint;
@@ -339,7 +339,7 @@ static int clk_vf_point_construct_volt_35(struct gk20a *g,
 
 static int clk_vf_point_construct_freq_35(struct gk20a *g,
 				       struct boardobj **ppboardobj,
-				       u16 size, void *pargs)
+				       size_t size, void *pargs)
 {
 	struct boardobj *ptmpobj = (struct boardobj *)pargs;
 	struct clk_vf_point_freq *pclkvfpoint;
@@ -377,22 +377,22 @@ struct clk_vf_point *construct_clk_vf_point(struct gk20a *g, void *pargs)
 	switch (BOARDOBJ_GET_TYPE(pargs)) {
 	case CTRL_CLK_CLK_VF_POINT_TYPE_FREQ:
 		status = clk_vf_point_construct_freq(g, &board_obj_ptr,
-			(u16)sizeof(struct clk_vf_point_freq), pargs);
+			sizeof(struct clk_vf_point_freq), pargs);
 		break;
 
 	case CTRL_CLK_CLK_VF_POINT_TYPE_VOLT:
 		status = clk_vf_point_construct_volt(g, &board_obj_ptr,
-			(u16)sizeof(struct clk_vf_point_volt), pargs);
+			sizeof(struct clk_vf_point_volt), pargs);
 		break;
 
 	case CTRL_CLK_CLK_VF_POINT_TYPE_35_FREQ:
 		status = clk_vf_point_construct_freq_35(g, &board_obj_ptr,
-			(u16)sizeof(struct clk_vf_point_freq), pargs);
+			sizeof(struct clk_vf_point_freq), pargs);
 		break;
 
 	case CTRL_CLK_CLK_VF_POINT_TYPE_35_VOLT:
 		status = clk_vf_point_construct_volt_35(g, &board_obj_ptr,
-			(u16)sizeof(struct clk_vf_point_volt), pargs);
+			sizeof(struct clk_vf_point_volt), pargs);
 		break;
 
 	default:
diff --git a/drivers/gpu/nvgpu/common/pmu/clk/clk_vin.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_vin.c
index 9961db23d..8d2f04fa5 100644
--- a/drivers/gpu/nvgpu/common/pmu/clk/clk_vin.c
+++ b/drivers/gpu/nvgpu/common/pmu/clk/clk_vin.c
@@ -39,13 +39,13 @@ static int devinit_get_vin_device_table(struct gk20a *g,
 
 static int vin_device_construct_v10(struct gk20a *g,
 					struct boardobj **ppboardobj,
-					u16 size, void *pargs);
+					size_t size, void *pargs);
 static int vin_device_construct_v20(struct gk20a *g,
 					struct boardobj **ppboardobj,
-					u16 size, void *pargs);
+					size_t size, void *pargs);
 static int vin_device_construct_super(struct gk20a *g,
 					struct boardobj **ppboardobj,
-					u16 size, void *pargs);
+					size_t size, void *pargs);
 static struct vin_device *construct_vin_device(struct gk20a *g, void *pargs);
 
 static int vin_device_init_pmudata_v10(struct gk20a *g,
@@ -375,7 +375,7 @@ done:
 
 static int vin_device_construct_v10(struct gk20a *g,
 					struct boardobj **ppboardobj,
-					u16 size, void *pargs)
+					size_t size, void *pargs)
 {
 	struct boardobj *ptmpobj = (struct boardobj *)pargs;
 	struct vin_device_v10 *pvin_device_v10;
@@ -405,7 +405,7 @@ static int vin_device_construct_v10(struct gk20a *g,
 
 static int vin_device_construct_v20(struct gk20a *g,
 					struct boardobj **ppboardobj,
-					u16 size, void *pargs)
+					size_t size, void *pargs)
 {
 	struct boardobj *ptmpobj = (struct boardobj *)pargs;
 	struct vin_device_v20 *pvin_device_v20;
@@ -436,7 +436,7 @@ static int vin_device_construct_v20(struct gk20a *g,
 }
 static int vin_device_construct_super(struct gk20a *g,
 					struct boardobj **ppboardobj,
-					u16 size, void *pargs)
+					size_t size, void *pargs)
 {
 	struct vin_device *pvin_device;
 	struct vin_device *ptmpvin_device = (struct vin_device *)pargs;
@@ -468,12 +468,12 @@ static struct vin_device *construct_vin_device(struct gk20a *g, void *pargs)
 	switch (BOARDOBJ_GET_TYPE(pargs)) {
 	case CTRL_CLK_VIN_TYPE_V10:
 		status = vin_device_construct_v10(g, &board_obj_ptr,
-			(u16)sizeof(struct vin_device_v10), pargs);
+			sizeof(struct vin_device_v10), pargs);
 		break;
 
 	case CTRL_CLK_VIN_TYPE_V20:
 		status = vin_device_construct_v20(g, &board_obj_ptr,
-			(u16)sizeof(struct vin_device_v20), pargs);
+			sizeof(struct vin_device_v20), pargs);
 		break;
 
 	default: