diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-10 13:59:39 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-10 23:24:35 -0400 |
commit | 19b76d4fd79a5d3cbb50c247247e03072c784893 (patch) | |
tree | 5ac530a4316a1fb6f5445850d4755146092bc07f /drivers | |
parent | a9c4c5d88db75d5ba2327fe16d3be1654518ccaf (diff) |
gpu: nvgpu: common: linux: 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: Ie3cf6f278dd4468832de3c3a6a6b601d55185461
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1459818
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvgpu_mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c index b282d050..31eb7190 100644 --- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <nvgpu/nvgpu_mem.h> | 17 | #include <nvgpu/nvgpu_mem.h> |
18 | #include <nvgpu/page_allocator.h> | 18 | #include <nvgpu/page_allocator.h> |
19 | #include <nvgpu/log.h> | ||
19 | 20 | ||
20 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
21 | #include "gk20a/mm_gk20a.h" | 22 | #include "gk20a/mm_gk20a.h" |
@@ -51,7 +52,7 @@ int nvgpu_mem_begin(struct gk20a *g, struct nvgpu_mem *mem) | |||
51 | return 0; | 52 | return 0; |
52 | 53 | ||
53 | if (WARN_ON(mem->cpu_va)) { | 54 | if (WARN_ON(mem->cpu_va)) { |
54 | gk20a_warn(dev_from_gk20a(g), "nested %s", __func__); | 55 | nvgpu_warn(g, "nested"); |
55 | return -EBUSY; | 56 | return -EBUSY; |
56 | } | 57 | } |
57 | 58 | ||