diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index 5e77de020..efad6ad66 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -132,7 +132,7 @@ int channel_gk20a_commit_va(struct channel_gk20a *c)
 	return 0;
 }
 
-int gk20a_channel_get_timescale_from_timeslice(struct gk20a *g,
+void gk20a_channel_get_timescale_from_timeslice(struct gk20a *g,
 		unsigned int timeslice_period,
 		unsigned int *__timeslice_timeout, unsigned int *__timeslice_scale)
 {
@@ -155,8 +155,6 @@ int gk20a_channel_get_timescale_from_timeslice(struct gk20a *g,
 
 	*__timeslice_timeout = value;
 	*__timeslice_scale = shift;
-
-	return 0;
 }
 
 int channel_gk20a_update_runlist(struct channel_gk20a *c, bool add)
diff --git a/drivers/gpu/nvgpu/include/nvgpu/channel.h b/drivers/gpu/nvgpu/include/nvgpu/channel.h
index 7a3d89e87..d19a7ca6d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/channel.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/channel.h
@@ -477,7 +477,7 @@ void channel_gk20a_joblist_unlock(struct channel_gk20a *c);
 bool channel_gk20a_joblist_is_empty(struct channel_gk20a *c);
 
 int channel_gk20a_update_runlist(struct channel_gk20a *c, bool add);
-int gk20a_channel_get_timescale_from_timeslice(struct gk20a *g,
+void gk20a_channel_get_timescale_from_timeslice(struct gk20a *g,
 		unsigned int timeslice_period,
 		unsigned int *__timeslice_timeout, unsigned int *__timeslice_scale);