diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-05-16 19:26:25 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-05-24 14:44:04 -0400 |
commit | 226ebab0655876ccd5376ac25b4fa80914aa8d25 (patch) | |
tree | f9461afc1cbf2c7b37da81db87adf5f4483f8b6d /drivers/gpu/nvgpu | |
parent | ac5438d983e6d1b50ba598c277027a331c60d207 (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/regops_gk20a.h | 22 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/posix/types.h | 13 |
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 @@ | |||
57 | #define NVGPU_DBG_REG_OP_STATUS_INVALID_MASK (0x00000010) | 57 | #define NVGPU_DBG_REG_OP_STATUS_INVALID_MASK (0x00000010) |
58 | 58 | ||
59 | struct nvgpu_dbg_reg_op { | 59 | struct nvgpu_dbg_reg_op { |
60 | __u8 op; | 60 | u8 op; |
61 | __u8 type; | 61 | u8 type; |
62 | __u8 status; | 62 | u8 status; |
63 | __u8 quad; | 63 | u8 quad; |
64 | __u32 group_mask; | 64 | u32 group_mask; |
65 | __u32 sub_group_mask; | 65 | u32 sub_group_mask; |
66 | __u32 offset; | 66 | u32 offset; |
67 | __u32 value_lo; | 67 | u32 value_lo; |
68 | __u32 value_hi; | 68 | u32 value_hi; |
69 | __u32 and_n_mask_lo; | 69 | u32 and_n_mask_lo; |
70 | __u32 and_n_mask_hi; | 70 | u32 and_n_mask_hi; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | struct regop_offset_range { | 73 | 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 @@ | |||
38 | */ | 38 | */ |
39 | #include <netinet/in.h> | 39 | #include <netinet/in.h> |
40 | 40 | ||
41 | typedef unsigned char __u8; | 41 | typedef unsigned char u8; |
42 | typedef unsigned short __u16; | 42 | typedef unsigned short u16; |
43 | typedef unsigned int __u32; | 43 | typedef unsigned int u32; |
44 | typedef unsigned long long __u64; | 44 | typedef unsigned long long u64; |
45 | |||
46 | typedef __u8 u8; | ||
47 | typedef __u16 u16; | ||
48 | typedef __u32 u32; | ||
49 | typedef __u64 u64; | ||
50 | 45 | ||
51 | typedef char s8; | 46 | typedef char s8; |
52 | typedef short s16; | 47 | typedef short s16; |