From 3a1104c3699b05201abf48ed9283bb8ccbe42732 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 13:02:43 -0700 Subject: gpu: nvgpu: therm: 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: I50bab058076c6896acfc6fa82f78f52a949dd3cf Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1457354 Reviewed-by: Alex Waterman --- drivers/gpu/nvgpu/perf/perf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/perf/perf.c') diff --git a/drivers/gpu/nvgpu/perf/perf.c b/drivers/gpu/nvgpu/perf/perf.c index 58efdd6c..3c27c6fc 100644 --- a/drivers/gpu/nvgpu/perf/perf.c +++ b/drivers/gpu/nvgpu/perf/perf.c @@ -30,8 +30,7 @@ static void perfrpc_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg, gk20a_dbg_info(""); if (msg->msg.perf.msg_type != NV_PMU_PERF_MSG_ID_RPC) { - gk20a_err(dev_from_gk20a(g), - "unsupported msg for VFE LOAD RPC %x", + nvgpu_err(g, "unsupported msg for VFE LOAD RPC %x", msg->msg.perf.msg_type); return; } @@ -97,8 +96,7 @@ u32 perf_pmu_vfe_load(struct gk20a *g) &seqdesc, ~0); if (status) { - gk20a_err(dev_from_gk20a(g), - "unable to post perf RPC cmd %x", + nvgpu_err(g, "unable to post perf RPC cmd %x", cmd.cmd.perf.cmd_type); goto done; } @@ -109,7 +107,7 @@ u32 perf_pmu_vfe_load(struct gk20a *g) if (handler.success == 0) { status = -EINVAL; - gk20a_err(dev_from_gk20a(g), "rpc call to load VFE failed"); + nvgpu_err(g, "rpc call to load VFE failed"); } done: return status; -- cgit v1.2.2