diff --git a/drivers/gpu/nvgpu/common/rc/rc.c b/drivers/gpu/nvgpu/common/rc/rc.c
index 57129080a..7052c64ec 100644
--- a/drivers/gpu/nvgpu/common/rc/rc.c
+++ b/drivers/gpu/nvgpu/common/rc/rc.c
@@ -95,7 +95,7 @@ void nvgpu_rc_ctxsw_timeout(struct gk20a *g, u32 eng_bitmask,
 #endif
 }
 
-int nvgpu_rc_pbdma_fault(struct gk20a *g, u32 pbdma_id, enum nvgpu_err_notif error_notifier,
+int nvgpu_rc_pbdma_fault(struct gk20a *g, u32 pbdma_id, u32 error_notifier,
 			struct nvgpu_pbdma_status_info *pbdma_status)
 {
 	u32 id_type = PBDMA_STATUS_ID_TYPE_INVALID;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h b/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h
index d01cdacf2..c145da686 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h
@@ -27,21 +27,19 @@
 
 struct nvgpu_channel;
 
-enum nvgpu_err_notif {
-	NVGPU_ERR_NOTIFIER_FIFO_ERROR_IDLE_TIMEOUT = 0,
-	NVGPU_ERR_NOTIFIER_GR_ERROR_SW_METHOD,
-	NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY,
-	NVGPU_ERR_NOTIFIER_GR_EXCEPTION,
-	NVGPU_ERR_NOTIFIER_GR_SEMAPHORE_TIMEOUT,
-	NVGPU_ERR_NOTIFIER_GR_ILLEGAL_NOTIFY,
-	NVGPU_ERR_NOTIFIER_FIFO_ERROR_MMU_ERR_FLT,
-	NVGPU_ERR_NOTIFIER_PBDMA_ERROR,
-	NVGPU_ERR_NOTIFIER_FECS_ERR_UNIMP_FIRMWARE_METHOD,
-	NVGPU_ERR_NOTIFIER_RESETCHANNEL_VERIF_ERROR,
-	NVGPU_ERR_NOTIFIER_PBDMA_PUSHBUFFER_CRC_MISMATCH,
-	NVGPU_ERR_NOTIFIER_CE_ERROR,
-	NVGPU_ERR_NOTIFIER_INVAL,
-};
+#define NVGPU_ERR_NOTIFIER_FIFO_ERROR_IDLE_TIMEOUT		0U
+#define NVGPU_ERR_NOTIFIER_GR_ERROR_SW_METHOD			1U
+#define NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY			2U
+#define NVGPU_ERR_NOTIFIER_GR_EXCEPTION				3U
+#define NVGPU_ERR_NOTIFIER_GR_SEMAPHORE_TIMEOUT			4U
+#define NVGPU_ERR_NOTIFIER_GR_ILLEGAL_NOTIFY			5U
+#define NVGPU_ERR_NOTIFIER_FIFO_ERROR_MMU_ERR_FLT		6U
+#define NVGPU_ERR_NOTIFIER_PBDMA_ERROR				7U
+#define NVGPU_ERR_NOTIFIER_FECS_ERR_UNIMP_FIRMWARE_METHOD	8U
+#define NVGPU_ERR_NOTIFIER_RESETCHANNEL_VERIF_ERROR		9U
+#define NVGPU_ERR_NOTIFIER_PBDMA_PUSHBUFFER_CRC_MISMATCH	10U
+#define NVGPU_ERR_NOTIFIER_CE_ERROR				11U
+#define NVGPU_ERR_NOTIFIER_INVAL				12U
 
 void nvgpu_set_err_notifier_locked(struct nvgpu_channel *ch, u32 error);
 void nvgpu_set_err_notifier(struct nvgpu_channel *ch, u32 error);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/rc.h b/drivers/gpu/nvgpu/include/nvgpu/rc.h
index 69d205970..7b93b4c9e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/rc.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/rc.h
@@ -103,7 +103,6 @@ struct nvgpu_tsg;
 struct nvgpu_channel;
 struct nvgpu_pbdma_status_info;
 struct mmu_fault_info;
-enum nvgpu_err_notif;
 
 static inline const char *nvgpu_rc_type_to_str(unsigned int rc_type)
 {
@@ -182,7 +181,7 @@ void nvgpu_rc_ctxsw_timeout(struct gk20a *g, u32 eng_bitmask,
  * 4. the channel is not bound to tsg.
  * 5. the id type or next_id type are not indicating channel id type or tsg id type.
  */
-int nvgpu_rc_pbdma_fault(struct gk20a *g, u32 pbdma_id, enum nvgpu_err_notif error_notifier,
+int nvgpu_rc_pbdma_fault(struct gk20a *g, u32 pbdma_id, u32 error_notifier,
 			struct nvgpu_pbdma_status_info *pbdma_status);
 
 /**