diff --git a/drivers/gpu/nvgpu/common/pmu/therm/thrmchannel.c b/drivers/gpu/nvgpu/common/pmu/therm/thrmchannel.c
index fa0f13b3c..3f2695e3f 100644
--- a/drivers/gpu/nvgpu/common/pmu/therm/thrmchannel.c
+++ b/drivers/gpu/nvgpu/common/pmu/therm/thrmchannel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2019, 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"),
@@ -65,7 +65,7 @@ done:
 	return status;
 }
 static struct boardobj *construct_channel_device(struct gk20a *g,
-			void *pargs, u16 pargs_size, u8 type)
+			void *pargs, size_t pargs_size, u8 type)
 {
 	struct boardobj *board_obj_ptr = NULL;
 	struct therm_channel *pchannel;
@@ -135,7 +135,7 @@ static int devinit_get_therm_channel_table(struct gk20a *g,
 	struct therm_channel_1x_entry *therm_channel_table_entry = NULL;
 	u32 index;
 	u32 obj_index = 0;
-	u16 therm_channel_size = 0;
+	size_t therm_channel_size = 0;
 	union {
 		struct boardobj boardobj;
 		struct therm_channel therm_channel;
diff --git a/drivers/gpu/nvgpu/common/pmu/therm/thrmdev.c b/drivers/gpu/nvgpu/common/pmu/therm/thrmdev.c
index 140f69e34..9d9c5ef79 100644
--- a/drivers/gpu/nvgpu/common/pmu/therm/thrmdev.c
+++ b/drivers/gpu/nvgpu/common/pmu/therm/thrmdev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2019, 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"),
@@ -58,19 +58,19 @@ static int _therm_device_pmudata_instget(struct gk20a *g,
 }
 
 static int construct_therm_device(struct gk20a *g,
-	struct boardobj **ppboardobj, u16 size, void *pargs)
+	struct boardobj **ppboardobj, size_t size, void *pargs)
 {
 	return boardobj_construct_super(g, ppboardobj, size, pargs);
 }
 
 static int construct_therm_device_gpu(struct gk20a *g,
-	struct boardobj **ppboardobj, u16 size, void *pargs)
+	struct boardobj **ppboardobj, size_t size, void *pargs)
 {
 	return construct_therm_device(g, ppboardobj, size, pargs);
 }
 
 static int construct_therm_device_gpu_sci(struct gk20a *g,
-	struct boardobj **ppboardobj, u16 size, void *pargs)
+	struct boardobj **ppboardobj, size_t size, void *pargs)
 {
 	return construct_therm_device(g, ppboardobj, size, pargs);
 }
@@ -99,7 +99,7 @@ exit:
 }
 
 static int construct_therm_device_gpu_tsosc(struct gk20a *g,
-	struct boardobj **ppboardobj, u16 size, void *pargs)
+	struct boardobj **ppboardobj, size_t size, void *pargs)
 {
 	struct therm_device_gpu_gpc_tsosc *pdev = NULL;
 	struct therm_device_gpu_gpc_tsosc *ptmp_dev =
@@ -144,7 +144,7 @@ exit:
 }
 
 static int construct_therm_device_hbm2_site(struct gk20a *g,
-	struct boardobj **ppboardobj, u16 size, void *pargs)
+	struct boardobj **ppboardobj, size_t size, void *pargs)
 {
 	struct therm_device_hbm2_site *pdev = NULL;
 	struct therm_device_hbm2_site *ptmp_dev =
@@ -167,7 +167,7 @@ static int construct_therm_device_hbm2_site(struct gk20a *g,
 }
 
 static int construct_therm_device_hbm2_combined(struct gk20a *g,
-	struct boardobj **ppboardobj, u16 size, void *pargs)
+	struct boardobj **ppboardobj, size_t size, void *pargs)
 {
 	return construct_therm_device(g, ppboardobj, size, pargs);
 }