gpu: nvgpu: Remove gk20a_dbg* functions

Switch all logging to nvgpu_log*(). gk20a_dbg* macros are
intentionally left there because of use from other repositories.

Because the new functions do not work without a pointer to struct
gk20a, and piping it just for logging is excessive, some log messages
are deleted.

Change-Id: I00e22e75fe4596a330bb0282ab4774b3639ee31e
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1704148
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c
index f8be8430..de3de62a 100644
--- a/drivers/gpu/nvgpu/therm/thrmchannel.c
+++ b/drivers/gpu/nvgpu/therm/thrmchannel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -90,7 +90,7 @@ static struct boardobj *construct_channel_device(struct gk20a *g,
         pchannel_device->therm_dev_idx = therm_device->therm_dev_idx;
         pchannel_device->therm_dev_prov_idx = therm_device->therm_dev_prov_idx;
 
-        gk20a_dbg_info(" Done");
+        nvgpu_log_info(g, " Done");
 
         return board_obj_ptr;
 }
@@ -104,7 +104,7 @@ static u32 _therm_channel_pmudata_instget(struct gk20a *g,
                 (struct nv_pmu_therm_therm_channel_boardobj_grp_set *)
                 pmuboardobjgrp;
 
-        gk20a_dbg_info("");
+        nvgpu_log_info(g, " ");
 
         /*check whether pmuboardobjgrp has a valid boardobj in index*/
         if (((u32)BIT(idx) &
@@ -114,7 +114,7 @@ static u32 _therm_channel_pmudata_instget(struct gk20a *g,
         *ppboardobjpmudata = (struct nv_pmu_boardobj *)
                 &pgrp_set->objects[idx].data.board_obj;
 
-        gk20a_dbg_info(" Done");
+        nvgpu_log_info(g, " Done");
 
         return 0;
 }
@@ -137,7 +137,7 @@ static u32 devinit_get_therm_channel_table(struct gk20a *g,
                 struct therm_channel_device device;
         } therm_channel_data;
 
-        gk20a_dbg_info("");
+        nvgpu_log_info(g, " ");
 
         therm_channel_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
                         g->bios.perf_token, THERMAL_CHANNEL_TABLE);
@@ -206,7 +206,7 @@ static u32 devinit_get_therm_channel_table(struct gk20a *g,
         }
 
 done:
-        gk20a_dbg_info(" done status %x", status);
+        nvgpu_log_info(g, " done status %x", status);
         return status;
 }
 
@@ -248,6 +248,6 @@ u32 therm_channel_sw_setup(struct gk20a *g)
         }
 
 done:
-        gk20a_dbg_info(" done status %x", status);
+        nvgpu_log_info(g, " done status %x", status);
         return status;
 }
diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c
index 1aff119c..7371ba25 100644
--- a/drivers/gpu/nvgpu/therm/thrmdev.c
+++ b/drivers/gpu/nvgpu/therm/thrmdev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -41,7 +41,7 @@ static struct boardobj *construct_therm_device(struct gk20a *g,
         if (status)
                 return NULL;
 
-        gk20a_dbg_info(" Done");
+        nvgpu_log_info(g, " Done");
 
         return board_obj_ptr;
 }
@@ -55,7 +55,7 @@ static u32 _therm_device_pmudata_instget(struct gk20a *g,
                 (struct nv_pmu_therm_therm_device_boardobj_grp_set *)
                 pmuboardobjgrp;
 
-        gk20a_dbg_info("");
+        nvgpu_log_info(g, " ");
 
         /*check whether pmuboardobjgrp has a valid boardobj in index*/
         if (((u32)BIT(idx) &
@@ -65,7 +65,7 @@ static u32 _therm_device_pmudata_instget(struct gk20a *g,
         *ppboardobjpmudata = (struct nv_pmu_boardobj *)
                 &pgrp_set->objects[idx].data;
 
-        gk20a_dbg_info(" Done");
+        nvgpu_log_info(g, " Done");
 
         return 0;
 }
@@ -87,7 +87,7 @@ static u32 devinit_get_therm_device_table(struct gk20a *g,
                 struct therm_device therm_device;
         } therm_device_data;
 
-        gk20a_dbg_info("");
+        nvgpu_log_info(g, " ");
 
         therm_device_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
                         g->bios.perf_token, THERMAL_DEVICE_TABLE);
@@ -153,7 +153,7 @@ static u32 devinit_get_therm_device_table(struct gk20a *g,
         }
 
 done:
-        gk20a_dbg_info(" done status %x", status);
+        nvgpu_log_info(g, " done status %x", status);
         return status;
 }
 
@@ -195,6 +195,6 @@ u32 therm_device_sw_setup(struct gk20a *g)
         }
 
 done:
-        gk20a_dbg_info(" done status %x", status);
+        nvgpu_log_info(g, " done status %x", status);
         return status;
 }