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>

1 files changed, 8 insertions, 8 deletions

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 @@
 struct gk20a;
 
 enum nvgpu_log_type {
-        ERROR,
-        WARNING,
-        DEBUG,
-        INFO,
+        NVGPU_ERROR,
+        NVGPU_WARNING,
+        NVGPU_DEBUG,
+        NVGPU_INFO,
 };
 
 /*
@@ -118,7 +118,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask);
  * Uncondtionally print an error message.
  */
 #define nvgpu_err(g, fmt, arg...)                                       \
-        __nvgpu_log_msg(g, __func__, __LINE__, ERROR, fmt, ##arg)
+        __nvgpu_log_msg(g, __func__, __LINE__, NVGPU_ERROR, fmt, ##arg)
 
 /**
  * nvgpu_err - Print a warning
@@ -130,7 +130,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask);
  * Uncondtionally print a warming message.
  */
 #define nvgpu_warn(g, fmt, arg...)                                      \
-        __nvgpu_log_msg(g, __func__, __LINE__, WARNING, fmt, ##arg)
+        __nvgpu_log_msg(g, __func__, __LINE__, NVGPU_WARNING, fmt, ##arg)
 
 /**
  * nvgpu_info - Print an info message
@@ -142,7 +142,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask);
  * Unconditionally print an information message.
  */
 #define nvgpu_info(g, fmt, arg...)                                      \
-        __nvgpu_log_msg(g, __func__, __LINE__, INFO, fmt, ##arg)
+        __nvgpu_log_msg(g, __func__, __LINE__, NVGPU_INFO, fmt, ##arg)
 
 /*
  * Some convenience macros.
@@ -170,7 +170,7 @@ extern u32 nvgpu_dbg_mask;
         do {                                                            \
                 if (((log_mask) & nvgpu_dbg_mask) != 0)                 \
                         __nvgpu_log_msg(NULL, __func__, __LINE__,       \
-                                        DEBUG, fmt "\n", ##arg);        \
+                                        NVGPU_DEBUG, fmt "\n", ##arg);  \
         } while (0)
 
 /*