gpu: nvgpu: gk20a: Use new error macro

gk20a_err() and gk20a_warn() require a struct device pointer,
which is not portable across operating systems. The new nvgpu_err()
and nvgpu_warn() macros take struct gk20a pointer. Convert code
to use the more portable macros.

JIRA NVGPU-16

Change-Id: Ia51f36d94c5ce57a5a0ab83b3c83a6bce09e2d5c
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1331694
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
index 1b9d515c..f8416d55 100644
--- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
@@ -20,6 +20,7 @@
 
 #include <trace/events/gk20a.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/log.h>
 
 #include "gk20a.h"
 
@@ -160,8 +161,7 @@ static int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
                         } while (!nvgpu_timeout_expired(&timeout));
 
                         if (nvgpu_timeout_peek_expired(&timeout)) {
-                                gk20a_err(dev_from_gk20a(g),
-                                           "comp tag clear timeout\n");
+                                nvgpu_err(g, "comp tag clear timeout");
                                 err = -EBUSY;
                                 goto out;
                         }
@@ -186,7 +186,7 @@ static void gk20a_ltc_isr(struct gk20a *g)
         u32 intr;
 
         intr = gk20a_readl(g, ltc_ltc0_ltss_intr_r());
-        gk20a_err(dev_from_gk20a(g), "ltc: %08x\n", intr);
+        nvgpu_err(g, "ltc: %08x\n", intr);
         gk20a_writel(g, ltc_ltc0_ltss_intr_r(), intr);
 }
 
@@ -215,7 +215,7 @@ static int gk20a_determine_L2_size_bytes(struct gk20a *g)
                  ltc_ltc0_lts0_tstg_cfg1_active_sets_quarter_v()) {
                 sets = 16;
         } else {
-                dev_err(dev_from_gk20a(g),
+                nvgpu_err(g,
                         "Unknown constant %u for active sets",
                        (unsigned)active_sets_value);
                 sets = 0;