diff --git a/drivers/gpu/nvgpu/os/linux/debug.c b/drivers/gpu/nvgpu/os/linux/debug.c
index 08123d618..ffbfec945 100644
--- a/drivers/gpu/nvgpu/os/linux/debug.c
+++ b/drivers/gpu/nvgpu/os/linux/debug.c
@@ -211,7 +211,7 @@ static ssize_t disable_bigpage_write(struct file *file, const char __user *user_
 	if (copy_from_user(buf, user_buf, buf_size))
 		return -EFAULT;
 
-	if (strtobool(buf, &bv) == 0) {
+	if (kstrtobool(buf, &bv) == 0) {
 		g->mm.disable_bigpage = bv;
 		err = nvgpu_init_gpu_characteristics(g);
 		if (err != 0) {
@@ -319,7 +319,7 @@ static ssize_t timeouts_enabled_write(struct file *file,
 	if (copy_from_user(buf, user_buf, buf_size))
 		return -EFAULT;
 
-	if (strtobool(buf, &timeouts_enabled) == 0) {
+	if (kstrtobool(buf, &timeouts_enabled) == 0) {
 		nvgpu_mutex_acquire(&g->dbg_sessions_lock);
 		if (timeouts_enabled == false) {
 			/* requesting to disable timeouts */
@@ -419,7 +419,7 @@ static ssize_t disable_syncpts_write(struct file *file,
 	if (!g->nvhost)
 		return -ENOSYS;
 
-	if (strtobool(buf, &disable_syncpts) == 0)
+	if (kstrtobool(buf, &disable_syncpts) == 0)
 		nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, !disable_syncpts);
 
 	return count;
diff --git a/drivers/gpu/nvgpu/os/linux/debug_gr.c b/drivers/gpu/nvgpu/os/linux/debug_gr.c
index 13f5c6e99..b4d2b691f 100644
--- a/drivers/gpu/nvgpu/os/linux/debug_gr.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_gr.c
@@ -344,7 +344,7 @@ static ssize_t force_preemption_gfxp_write(struct file *file,
 		return -EFAULT;
 	}
 
-	if (strtobool(buf, &val) == 0) {
+	if (kstrtobool(buf, &val) == 0) {
 		g->gr->gr_ctx_desc->force_preemption_gfxp = val;
 	}
 
@@ -396,7 +396,7 @@ static ssize_t force_preemption_cilp_write(struct file *file,
 		return -EFAULT;
 	}
 
-	if (strtobool(buf, &val) == 0) {
+	if (kstrtobool(buf, &val) == 0) {
 		g->gr->gr_ctx_desc->force_preemption_cilp = val;
 	}
 
@@ -448,7 +448,7 @@ static ssize_t dump_ctxsw_stats_on_channel_close_write(struct file *file,
 		return -EFAULT;
 	}
 
-	if (strtobool(buf, &val) == 0) {
+	if (kstrtobool(buf, &val) == 0) {
 		g->gr->gr_ctx_desc->dump_ctxsw_stats_on_channel_close = val;
 	}
 
diff --git a/drivers/gpu/nvgpu/os/linux/debug_gsp.c b/drivers/gpu/nvgpu/os/linux/debug_gsp.c
index 2f02f13f2..5047ad071 100644
--- a/drivers/gpu/nvgpu/os/linux/debug_gsp.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_gsp.c
@@ -197,7 +197,7 @@ static ssize_t gsp_start_test_write(struct file *file,
 	if (copy_from_user(buf, user_buf, buf_size))
 		return -EFAULT;
 
-	if (strtobool(buf, &bv) == 0) {
+	if (kstrtobool(buf, &bv) == 0) {
 		if (nvgpu_is_powered_on(g) && nvgpu_gsp_get_stress_test_load(g)) {
 			err = gk20a_busy(g);
 			if (err)
@@ -258,7 +258,7 @@ static ssize_t gsp_load_test_write(struct file *file,
 	if (copy_from_user(buf, user_buf, buf_size))
 		return -EFAULT;
 
-	if (strtobool(buf, &bv) == 0) {
+	if (kstrtobool(buf, &bv) == 0) {
 		if (nvgpu_is_powered_on(g)) {
 			err = gk20a_busy(g);
 			if (err)
diff --git a/drivers/gpu/nvgpu/os/linux/debug_ltc.c b/drivers/gpu/nvgpu/os/linux/debug_ltc.c
index ca8a61174..4263bd821 100644
--- a/drivers/gpu/nvgpu/os/linux/debug_ltc.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_ltc.c
@@ -59,7 +59,7 @@ static ssize_t ltc_intr_illegal_compstat_write(struct file *file,
 	if (err)
 		return err;
 
-	if (strtobool(buf, &intr_illegal_compstat_enabled) == 0) {
+	if (kstrtobool(buf, &intr_illegal_compstat_enabled) == 0) {
 		g->ops.ltc.intr.en_illegal_compstat(g,
 				intr_illegal_compstat_enabled);
 		g->ltc_intr_en_illegal_compstat = intr_illegal_compstat_enabled;