diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-06 16:02:43 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-10 15:24:22 -0400 |
commit | 3a1104c3699b05201abf48ed9283bb8ccbe42732 (patch) | |
tree | a2e9445f730e9de76cbb7e68d3410a97ded588fa /drivers/gpu/nvgpu/perf/perf.c | |
parent | 54eb74539342ce0fa6961e46f2ce22b68ad2fb21 (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457354
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/perf/perf.c')
-rw-r--r-- | drivers/gpu/nvgpu/perf/perf.c | 8 |
1 files changed, 3 insertions, 5 deletions
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, | |||
30 | gk20a_dbg_info(""); | 30 | gk20a_dbg_info(""); |
31 | 31 | ||
32 | if (msg->msg.perf.msg_type != NV_PMU_PERF_MSG_ID_RPC) { | 32 | if (msg->msg.perf.msg_type != NV_PMU_PERF_MSG_ID_RPC) { |
33 | gk20a_err(dev_from_gk20a(g), | 33 | nvgpu_err(g, "unsupported msg for VFE LOAD RPC %x", |
34 | "unsupported msg for VFE LOAD RPC %x", | ||
35 | msg->msg.perf.msg_type); | 34 | msg->msg.perf.msg_type); |
36 | return; | 35 | return; |
37 | } | 36 | } |
@@ -97,8 +96,7 @@ u32 perf_pmu_vfe_load(struct gk20a *g) | |||
97 | &seqdesc, ~0); | 96 | &seqdesc, ~0); |
98 | 97 | ||
99 | if (status) { | 98 | if (status) { |
100 | gk20a_err(dev_from_gk20a(g), | 99 | nvgpu_err(g, "unable to post perf RPC cmd %x", |
101 | "unable to post perf RPC cmd %x", | ||
102 | cmd.cmd.perf.cmd_type); | 100 | cmd.cmd.perf.cmd_type); |
103 | goto done; | 101 | goto done; |
104 | } | 102 | } |
@@ -109,7 +107,7 @@ u32 perf_pmu_vfe_load(struct gk20a *g) | |||
109 | 107 | ||
110 | if (handler.success == 0) { | 108 | if (handler.success == 0) { |
111 | status = -EINVAL; | 109 | status = -EINVAL; |
112 | gk20a_err(dev_from_gk20a(g), "rpc call to load VFE failed"); | 110 | nvgpu_err(g, "rpc call to load VFE failed"); |
113 | } | 111 | } |
114 | done: | 112 | done: |
115 | return status; | 113 | return status; |