gpu: nvgpu: gp10b: Use new error macros

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: I8dc0ddf3b6ea38af6300c27558b60786c163da6d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457344
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
index e1aa34a9..42bfbf29 100644
--- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
@@ -18,6 +18,8 @@
 #include "gk20a/gk20a.h"
 #include "gm20b/ltc_gm20b.h"
 
+#include <nvgpu/log.h>
+
 #include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h>
 
@@ -128,8 +130,7 @@ static void gp10b_ltc_isr(struct gk20a *g)
         u32 lts_stride = nvgpu_get_litter_value(g, GPU_LIT_LTS_STRIDE);
 
         mc_intr = gk20a_readl(g, mc_intr_ltc_r());
-        gk20a_err(dev_from_gk20a(g), "mc_ltc_intr: %08x",
-                  mc_intr);
+        nvgpu_err(g, "mc_ltc_intr: %08x", mc_intr);
         for (ltc = 0; ltc < g->ltc_count; ltc++) {
                 if ((mc_intr & 1 << ltc) == 0)
                         continue;
@@ -142,7 +143,7 @@ static void gp10b_ltc_isr(struct gk20a *g)
                                 ltc_ltcs_ltss_intr_ecc_sec_error_pending_f()) {
                                 u32 ecc_stats_reg_val;
 
-                                gk20a_err(dev_from_gk20a(g),
+                                nvgpu_err(g,
                                         "Single bit error detected in GPU L2!");
 
                                 ecc_stats_reg_val =
@@ -162,7 +163,7 @@ static void gp10b_ltc_isr(struct gk20a *g)
                                 ltc_ltcs_ltss_intr_ecc_ded_error_pending_f()) {
                                 u32 ecc_stats_reg_val;
 
-                                gk20a_err(dev_from_gk20a(g),
+                                nvgpu_err(g,
                                         "Double bit error detected in GPU L2!");
 
                                 ecc_stats_reg_val =
@@ -177,7 +178,7 @@ static void gp10b_ltc_isr(struct gk20a *g)
                                         ecc_stats_reg_val);
                         }
 
-                        gk20a_err(dev_from_gk20a(g), "ltc%d, slice %d: %08x",
+                        nvgpu_err(g, "ltc%d, slice %d: %08x",
                                   ltc, slice, ltc_intr);
                         gk20a_writel(g, ltc_ltc0_lts0_intr_r() +
                                            ltc_stride * ltc + lts_stride * slice,