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, 3 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
index 6281e4ad..5f07ade7 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
@@ -15,6 +15,7 @@
  */
 
 #include <nvgpu/kmem.h>
+#include <nvgpu/log.h>
 
 #include "gk20a.h"
 #include "tsg_gk20a.h"
@@ -93,7 +94,7 @@ int gk20a_tsg_bind_channel(struct tsg_gk20a *tsg,
         if (tsg->runlist_id == FIFO_INVAL_TSG_ID)
                 tsg->runlist_id = ch->runlist_id;
         else if (tsg->runlist_id != ch->runlist_id) {
-                gk20a_err(dev_from_gk20a(tsg->g),
+                nvgpu_err(tsg->g,
                         "Error: TSG channel should be share same runlist ch[%d] tsg[%d]\n",
                         ch->runlist_id, tsg->runlist_id);
                 return -EINVAL;
@@ -260,8 +261,7 @@ struct tsg_gk20a *gk20a_tsg_open(struct gk20a *g)
         if (g->ops.fifo.tsg_open) {
                 err = g->ops.fifo.tsg_open(tsg);
                 if (err) {
-                        gk20a_err(dev_from_gk20a(g),
-                                  "tsg %d fifo open failed %d",
+                        nvgpu_err(g, "tsg %d fifo open failed %d",
                                   tsg->tsgid, err);
                         goto clean_up;
                 }