diff --git a/drivers/gpu/nvgpu/hal/fifo/fifo_gk20a.c b/drivers/gpu/nvgpu/hal/fifo/fifo_gk20a.c
index 81cb0c072..23bde863a 100644
--- a/drivers/gpu/nvgpu/hal/fifo/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/hal/fifo/fifo_gk20a.c
@@ -90,15 +90,13 @@ void gk20a_fifo_bar1_snooping_disable(struct gk20a *g)
 		fifo_bar1_base_valid_false_f());
 }
 
-int gk20a_fifo_init_pbdma_map(struct gk20a *g, u32 *pbdma_map, u32 num_pbdma)
+void gk20a_fifo_init_pbdma_map(struct gk20a *g, u32 *pbdma_map, u32 num_pbdma)
 {
 	u32 id;
 
 	for (id = 0U; id < num_pbdma; ++id) {
 		pbdma_map[id] = nvgpu_readl(g, fifo_pbdma_map_r(id));
 	}
-
-	return 0U;
 }
 
 u32 gk20a_fifo_get_runlist_timeslice(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/hal/fifo/fifo_gk20a.h b/drivers/gpu/nvgpu/hal/fifo/fifo_gk20a.h
index e93303581..00c047a3e 100644
--- a/drivers/gpu/nvgpu/hal/fifo/fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/hal/fifo/fifo_gk20a.h
@@ -29,7 +29,7 @@
 int gk20a_init_fifo_reset_enable_hw(struct gk20a *g);
 int gk20a_init_fifo_setup_hw(struct gk20a *g);
 void gk20a_fifo_bar1_snooping_disable(struct gk20a *g);
-int gk20a_fifo_init_pbdma_map(struct gk20a *g, u32 *pbdma_map, u32 num_pbdma);
+void gk20a_fifo_init_pbdma_map(struct gk20a *g, u32 *pbdma_map, u32 num_pbdma);
 u32 gk20a_fifo_get_runlist_timeslice(struct gk20a *g);
 u32 gk20a_fifo_get_pb_timeslice(struct gk20a *g);
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 866e89f01..7830e5c07 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -989,7 +989,7 @@ struct gpu_ops {
 				u32 id, unsigned int id_type);
 		int (*preempt_poll_pbdma)(struct gk20a *g, u32 tsgid,
 				 u32 pbdma_id);
-		int (*init_pbdma_map)(struct gk20a *g,
+		void (*init_pbdma_map)(struct gk20a *g,
 				u32 *pbdma_map, u32 num_pbdma);
 		int (*is_preempt_pending)(struct gk20a *g, u32 id,
 			unsigned int id_type);