From 57d624f900896a257e2e918e93e99a14f734aea5 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 10:55:48 -0700 Subject: 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 Reviewed-on: http://git-master/r/1457344 Reviewed-by: svccoveritychecker Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c index e8f3d930..77c6853c 100644 --- a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c @@ -42,8 +42,7 @@ int gp10b_replayable_pagefault_buffer_init(struct gk20a *g) err = nvgpu_dma_alloc_map_sys(vm, rbfb_size, &g->mm.bar2_desc); if (err) { - dev_err(dev_from_gk20a(g), - "%s Error in replayable fault buffer\n", __func__); + nvgpu_err(g, "Error in replayable fault buffer"); return err; } } @@ -75,8 +74,8 @@ u32 gp10b_replayable_pagefault_buffer_get_index(struct gk20a *g) get_idx = gk20a_readl(g, fifo_replay_fault_buffer_get_r()); if (get_idx >= fifo_replay_fault_buffer_size_hw_entries_v()) - dev_err(dev_from_gk20a(g), "%s Error in replayable fault buffer\n", - __func__); + nvgpu_err(g, "Error in replayable fault buffer"); + gk20a_dbg_fn("done"); return get_idx; } @@ -89,8 +88,8 @@ u32 gp10b_replayable_pagefault_buffer_put_index(struct gk20a *g) put_idx = gk20a_readl(g, fifo_replay_fault_buffer_put_r()); if (put_idx >= fifo_replay_fault_buffer_size_hw_entries_v()) - dev_err(dev_from_gk20a(g), "%s Error in UVM\n", - __func__); + nvgpu_err(g, "Error in UVM"); + gk20a_dbg_fn("done"); return put_idx; } -- cgit v1.2.2