diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index cfc3490b7..53841fc76 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -3330,7 +3330,7 @@ static u32 nvgpu_runlist_append_tsg(struct gk20a *g,
 		struct tsg_gk20a *tsg)
 {
 	struct fifo_gk20a *f = &g->fifo;
-	u32 runlist_entry_words = f->runlist_entry_size / sizeof(u32);
+	u32 runlist_entry_words = f->runlist_entry_size / (u32)sizeof(u32);
 	struct channel_gk20a *ch;
 	u32 count = 0;
 
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
index f9408eb95..69d757ead 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
@@ -32,12 +32,10 @@ struct nvgpu_semaphore;
 struct channel_gk20a;
 struct tsg_gk20a;
 
-enum {
-	NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_LOW = 0U,
-	NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_MEDIUM = 1U,
-	NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_HIGH = 2U,
-	NVGPU_FIFO_RUNLIST_INTERLEAVE_NUM_LEVELS = 3U,
-};
+#define NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_LOW     0U
+#define NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_MEDIUM  1U
+#define NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_HIGH    2U
+#define NVGPU_FIFO_RUNLIST_INTERLEAVE_NUM_LEVELS    3U
 
 #define MAX_RUNLIST_BUFFERS		2