diff options
author | Shashank Singh <shashsingh@nvidia.com> | 2017-09-28 08:28:10 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-04 06:40:10 -0400 |
commit | 14d99f1575ca34c5d200a85496eb60e9eeef1ed1 (patch) | |
tree | 87deb9b6bc399693783741c527634abc212426d8 | |
parent | 33f475d6d871a0edfa7e02da9ba1706bfb362192 (diff) |
gpu: nvgpu: change logging enum names
Add nvgpu prefix to logging enums.
In debug mode QNX, Integrity have already
a hashdef DEBUG and it is conflicting with
logging enum DEBUG
Change-Id: I882e566302842f8b79daf11d5f0850dec222cfea
Signed-off-by: Shashank Singh <shashsingh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1570193
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/log.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/log.h | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/common/linux/log.c index e2cebee8..f371bb77 100644 --- a/drivers/gpu/nvgpu/common/linux/log.c +++ b/drivers/gpu/nvgpu/common/linux/log.c | |||
@@ -82,7 +82,7 @@ static void __nvgpu_really_print_log(u32 trace, const char *gpu_name, | |||
82 | const char *log_type = log_types[type]; | 82 | const char *log_type = log_types[type]; |
83 | 83 | ||
84 | switch (type) { | 84 | switch (type) { |
85 | case DEBUG: | 85 | case NVGPU_DEBUG: |
86 | /* | 86 | /* |
87 | * We could use pr_debug() here but we control debug enablement | 87 | * We could use pr_debug() here but we control debug enablement |
88 | * separately from the Linux kernel. Perhaps this is a bug in | 88 | * separately from the Linux kernel. Perhaps this is a bug in |
@@ -90,13 +90,13 @@ static void __nvgpu_really_print_log(u32 trace, const char *gpu_name, | |||
90 | */ | 90 | */ |
91 | pr_info(LOG_FMT, name, func_name, line, log_type, log); | 91 | pr_info(LOG_FMT, name, func_name, line, log_type, log); |
92 | break; | 92 | break; |
93 | case INFO: | 93 | case NVGPU_INFO: |
94 | pr_info(LOG_FMT, name, func_name, line, log_type, log); | 94 | pr_info(LOG_FMT, name, func_name, line, log_type, log); |
95 | break; | 95 | break; |
96 | case WARNING: | 96 | case NVGPU_WARNING: |
97 | pr_warn(LOG_FMT, name, func_name, line, log_type, log); | 97 | pr_warn(LOG_FMT, name, func_name, line, log_type, log); |
98 | break; | 98 | break; |
99 | case ERROR: | 99 | case NVGPU_ERROR: |
100 | pr_err(LOG_FMT, name, func_name, line, log_type, log); | 100 | pr_err(LOG_FMT, name, func_name, line, log_type, log); |
101 | break; | 101 | break; |
102 | } | 102 | } |
@@ -134,5 +134,5 @@ void __nvgpu_log_dbg(struct gk20a *g, u32 log_mask, | |||
134 | va_end(args); | 134 | va_end(args); |
135 | 135 | ||
136 | __nvgpu_really_print_log(g->log_trace, nvgpu_log_name(g), | 136 | __nvgpu_really_print_log(g->log_trace, nvgpu_log_name(g), |
137 | func_name, line, DEBUG, log); | 137 | func_name, line, NVGPU_DEBUG, log); |
138 | } | 138 | } |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/log.h b/drivers/gpu/nvgpu/include/nvgpu/log.h index e0d50f5f..2afddacb 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/log.h +++ b/drivers/gpu/nvgpu/include/nvgpu/log.h | |||
@@ -29,10 +29,10 @@ | |||
29 | struct gk20a; | 29 | struct gk20a; |
30 | 30 | ||
31 | enum nvgpu_log_type { | 31 | enum nvgpu_log_type { |
32 | ERROR, | 32 | NVGPU_ERROR, |
33 | WARNING, | 33 | NVGPU_WARNING, |
34 | DEBUG, | 34 | NVGPU_DEBUG, |
35 | INFO, | 35 | NVGPU_INFO, |
36 | }; | 36 | }; |
37 | 37 | ||
38 | /* | 38 | /* |
@@ -118,7 +118,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask); | |||
118 | * Uncondtionally print an error message. | 118 | * Uncondtionally print an error message. |
119 | */ | 119 | */ |
120 | #define nvgpu_err(g, fmt, arg...) \ | 120 | #define nvgpu_err(g, fmt, arg...) \ |
121 | __nvgpu_log_msg(g, __func__, __LINE__, ERROR, fmt, ##arg) | 121 | __nvgpu_log_msg(g, __func__, __LINE__, NVGPU_ERROR, fmt, ##arg) |
122 | 122 | ||
123 | /** | 123 | /** |
124 | * nvgpu_err - Print a warning | 124 | * nvgpu_err - Print a warning |
@@ -130,7 +130,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask); | |||
130 | * Uncondtionally print a warming message. | 130 | * Uncondtionally print a warming message. |
131 | */ | 131 | */ |
132 | #define nvgpu_warn(g, fmt, arg...) \ | 132 | #define nvgpu_warn(g, fmt, arg...) \ |
133 | __nvgpu_log_msg(g, __func__, __LINE__, WARNING, fmt, ##arg) | 133 | __nvgpu_log_msg(g, __func__, __LINE__, NVGPU_WARNING, fmt, ##arg) |
134 | 134 | ||
135 | /** | 135 | /** |
136 | * nvgpu_info - Print an info message | 136 | * nvgpu_info - Print an info message |
@@ -142,7 +142,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask); | |||
142 | * Unconditionally print an information message. | 142 | * Unconditionally print an information message. |
143 | */ | 143 | */ |
144 | #define nvgpu_info(g, fmt, arg...) \ | 144 | #define nvgpu_info(g, fmt, arg...) \ |
145 | __nvgpu_log_msg(g, __func__, __LINE__, INFO, fmt, ##arg) | 145 | __nvgpu_log_msg(g, __func__, __LINE__, NVGPU_INFO, fmt, ##arg) |
146 | 146 | ||
147 | /* | 147 | /* |
148 | * Some convenience macros. | 148 | * Some convenience macros. |
@@ -170,7 +170,7 @@ extern u32 nvgpu_dbg_mask; | |||
170 | do { \ | 170 | do { \ |
171 | if (((log_mask) & nvgpu_dbg_mask) != 0) \ | 171 | if (((log_mask) & nvgpu_dbg_mask) != 0) \ |
172 | __nvgpu_log_msg(NULL, __func__, __LINE__, \ | 172 | __nvgpu_log_msg(NULL, __func__, __LINE__, \ |
173 | DEBUG, fmt "\n", ##arg); \ | 173 | NVGPU_DEBUG, fmt "\n", ##arg); \ |
174 | } while (0) | 174 | } while (0) |
175 | 175 | ||
176 | /* | 176 | /* |