diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/nvgpu_gpmu_cmdif.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/nvgpu_gpmu_cmdif.h
index 40b298c39..61b7460c2 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/nvgpu_gpmu_cmdif.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/nvgpu_gpmu_cmdif.h
@@ -115,26 +115,26 @@ struct pmu_msg {
 	} msg;
 };
 
-#define PMU_UNIT_REWIND			(0x00U)
-#define PMU_UNIT_PG			(0x03U)
-#define PMU_UNIT_INIT			(0x07U)
-#define PMU_UNIT_ACR			(0x0AU)
-#define PMU_UNIT_PERFMON_T18X		(0x11U)
-#define PMU_UNIT_PERFMON		(0x12U)
-#define PMU_UNIT_PERF			(0x13U)
-#define PMU_UNIT_RC			(0x1FU)
-#define PMU_UNIT_FECS_MEM_OVERRIDE	(0x1EU)
-#define PMU_UNIT_CLK			(0x0DU)
-#define PMU_UNIT_THERM			(0x14U)
-#define PMU_UNIT_PMGR			(0x18U)
-#define PMU_UNIT_VOLT			(0x0EU)
+#define PMU_UNIT_REWIND			U8(0x00)
+#define PMU_UNIT_PG			U8(0x03)
+#define PMU_UNIT_INIT			U8(0x07)
+#define PMU_UNIT_ACR			U8(0x0A)
+#define PMU_UNIT_PERFMON_T18X		U8(0x11)
+#define PMU_UNIT_PERFMON		U8(0x12)
+#define PMU_UNIT_PERF			U8(0x13)
+#define PMU_UNIT_RC			U8(0x1F)
+#define PMU_UNIT_FECS_MEM_OVERRIDE	U8(0x1E)
+#define PMU_UNIT_CLK			U8(0x0D)
+#define PMU_UNIT_THERM			U8(0x14)
+#define PMU_UNIT_PMGR			U8(0x18)
+#define PMU_UNIT_VOLT			U8(0x0E)
 
-#define PMU_UNIT_END			(0x23U)
-#define PMU_UNIT_INVALID		(0xFFU)
+#define PMU_UNIT_END			U8(0x23)
+#define PMU_UNIT_INVALID		U8(0xFF)
 
-#define PMU_UNIT_TEST_START		(0xFEU)
-#define PMU_UNIT_END_SIM		(0xFFU)
-#define PMU_UNIT_TEST_END		(0xFFU)
+#define PMU_UNIT_TEST_START		U8(0xFE)
+#define PMU_UNIT_END_SIM		U8(0xFF)
+#define PMU_UNIT_TEST_END		U8(0xFF)
 
 #define PMU_UNIT_ID_IS_VALID(id)		\
 		(((id) < PMU_UNIT_END) || ((id) >= PMU_UNIT_TEST_START))