From 5405070ecd27ce462babc1dff231fec5cd8bd6b7 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 13:10:30 -0700 Subject: gpu: nvgpu: vgpu: 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: I071e8c50959bfa81730ca964d912bc69f9c7e6ad Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1457355 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c') diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c index 1a5811fe..cc9c46bf 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c @@ -88,7 +88,7 @@ static int vgpu_gr_gp10b_alloc_gr_ctx(struct gk20a *g, err = g->ops.gr.set_ctxsw_preemption_mode(g, gr_ctx, vm, class, graphics_preempt_mode, compute_preempt_mode); if (err) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "set_ctxsw_preemption_mode failed"); goto fail; } @@ -254,7 +254,7 @@ static int vgpu_gr_gp10b_set_ctxsw_preemption_mode(struct gk20a *g, return err; fail: - gk20a_err(dev_from_gk20a(g), "%s failed %d", __func__, err); + nvgpu_err(g, "%s failed %d", __func__, err); return err; } @@ -297,8 +297,7 @@ static int vgpu_gr_gp10b_set_preemption_mode(struct channel_gk20a *ch, graphics_preempt_mode, compute_preempt_mode); if (err) { - gk20a_err(dev_from_gk20a(g), - "set_ctxsw_preemption_mode failed"); + nvgpu_err(g, "set_ctxsw_preemption_mode failed"); return err; } } else { -- cgit v1.2.2