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

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
index 8b322296..4d68926f 100644
--- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
@@ -16,12 +16,13 @@
  * this program.
  */
 
-#include <nvgpu/dma.h>
-
 #include "gk20a/gk20a.h"
 
 #include "gv11b/subctx_gv11b.h"
 
+#include <nvgpu/dma.h>
+#include <nvgpu/log.h>
+
 #include <nvgpu/hw/gv11b/hw_ram_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h>
 
@@ -58,8 +59,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c)
                                 gr->ctx_vars.golden_image_size,
                                 &ctx->mem);
                 if (ret) {
-                        gk20a_err(dev_from_gk20a(g),
-                                "failed to allocate sub ctx header");
+                        nvgpu_err(g, "failed to allocate sub ctx header");
                         return ret;
                 }
                 ctx->mem.gpu_va = gk20a_gmmu_map(c->vm,
@@ -69,8 +69,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c)
                                         gk20a_mem_flag_none, true,
                                         ctx->mem.aperture);
                 if (!ctx->mem.gpu_va) {
-                        gk20a_err(dev_from_gk20a(g),
-                                "failed to map ctx header");
+                        nvgpu_err(g, "failed to map ctx header");
                         nvgpu_dma_free(g, &ctx->mem);
                         return -ENOMEM;
                 }