gpu: nvgpu: Remove __uXX typedefs

Integrity already typedefs these and complains if you override them
even with the same underlying type.

Since we only use these in the regops_gk20a.h header file (outside of
the Linux specific code, that is) this patch just changes the __uXX to
uXX. With that we can delete the now unnecessary __uXX defs.

JIRA NVGPU-525

Change-Id: I01dd2723b68db2170449342f73c711ee5a589adb
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1721186
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 15 insertions, 20 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/regops_gk20a.h b/drivers/gpu/nvgpu/gk20a/regops_gk20a.h
index 236fb52c..0fb108a4 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 3dfcec6c..10754a09 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;