Return const pointers to string constants.

Also update how Instance Pointers are aligned in the runlist output
to make them more easily distinguishable from other fields.

1 files changed, 3 insertions, 5 deletions

diff --git a/nvdebug.h b/nvdebug.h
index 926419d..f0662cd 100644
--- a/nvdebug.h
+++ b/nvdebug.h
@@ -67,7 +67,7 @@ struct gk20a;
 */
 enum ENTRY_TYPE {ENTRY_TYPE_CHAN = 0, ENTRY_TYPE_TSG = 1};
 enum INST_TARGET {TARGET_VID_MEM = 0, TARGET_SYS_MEM_COHERENT = 2, TARGET_SYS_MEM_NONCOHERENT = 3};
-static inline char* target_to_text(enum INST_TARGET t) {
+static inline const char *target_to_text(enum INST_TARGET t) {
         switch (t) {
                 case TARGET_VID_MEM:
                         return "VID_MEM";
@@ -76,7 +76,6 @@ static inline char* target_to_text(enum INST_TARGET t) {
                 case TARGET_SYS_MEM_NONCOHERENT:
                         return "SYS_MEM_NONCOHERENT";
                 default:
-                        printk(KERN_WARNING "[nvdebug] Invalid aperture!\n");
                         return "INVALID";
         }
 }
@@ -855,7 +854,7 @@ enum PD_TARGET {
         PTE_AND_TARGET_SYS_MEM_COHERENT = 5,  // b101
         PTE_AND_TARGET_SYS_MEM_NONCOHERENT = 7,  // b111
 };
-static inline char* pd_target_to_text(enum PD_TARGET t) {
+static inline const char *pd_target_to_text(enum PD_TARGET t) {
         switch (t) {
                 case PD_AND_TARGET_INVALID:
                         return "INVALID";
@@ -871,8 +870,7 @@ static inline char* pd_target_to_text(enum PD_TARGET t) {
                 case PTE_AND_TARGET_SYS_MEM_NONCOHERENT:
                         return "SYS_MEM_NONCOHERENT";
                 default:
-                        printk(KERN_WARNING "[nvdebug] Invalid aperture!\n");
-                        return NULL;
+                        return "UNKNOWN";
         }
 }