From 3ba374a5d94f8c2067731155afaf79f03e6c390c Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 30 Mar 2017 07:44:03 -0700 Subject: 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 Reviewed-on: http://git-master/r/1331694 Reviewed-by: svccoveritychecker Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/tsg_gk20a.c') 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 +#include #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; } -- cgit v1.2.2