diff --git a/drivers/gpu/nvgpu/gk20a/regops_gk20a.h b/drivers/gpu/nvgpu/gk20a/regops_gk20a.h
index 236fb52c7..0fb108a4f 100644
--- a/drivers/gpu/nvgpu/gk20a/regops_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/regops_gk20a.h
@@ -57,17 +57,17 @@
 #define NVGPU_DBG_REG_OP_STATUS_INVALID_MASK                 (0x00000010)
 
 struct nvgpu_dbg_reg_op {
-	__u8    op;
-	__u8    type;
-	__u8    status;
-	__u8    quad;
-	__u32   group_mask;
-	__u32   sub_group_mask;
-	__u32   offset;
-	__u32   value_lo;
-	__u32   value_hi;
-	__u32   and_n_mask_lo;
-	__u32   and_n_mask_hi;
+	u8    op;
+	u8    type;
+	u8    status;
+	u8    quad;
+	u32   group_mask;
+	u32   sub_group_mask;
+	u32   offset;
+	u32   value_lo;
+	u32   value_hi;
+	u32   and_n_mask_lo;
+	u32   and_n_mask_hi;
 };
 
 struct regop_offset_range {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/posix/types.h b/drivers/gpu/nvgpu/include/nvgpu/posix/types.h
index 3dfcec6c7..10754a09b 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/posix/types.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/posix/types.h
@@ -38,15 +38,10 @@
  */
 #include <netinet/in.h>
 
-typedef unsigned char		__u8;
-typedef unsigned short		__u16;
-typedef unsigned int		__u32;
-typedef unsigned long long	__u64;
-
-typedef __u8			u8;
-typedef __u16			u16;
-typedef __u32			u32;
-typedef __u64			u64;
+typedef unsigned char		u8;
+typedef unsigned short		u16;
+typedef unsigned int		u32;
+typedef unsigned long long	u64;
 
 typedef char			s8;
 typedef short			s16;