diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-03-30 10:44:03 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-10 22:04:19 -0400 |
commit | 3ba374a5d94f8c2067731155afaf79f03e6c390c (patch) | |
tree | d8a2bd0d52b1e8862510aedeb7529944c0b7e28e /drivers/gpu/nvgpu/gk20a/hal.c | |
parent | 2be51206af88aba6662cdd9de5bd6c18989bbcbd (diff) |
gpu: nvgpu: gk20a: Use new error macro
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: Ia51f36d94c5ce57a5a0ab83b3c83a6bce09e2d5c
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1331694
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/hal.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index dc4fcf1c..bbde885f 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c | |||
@@ -23,6 +23,8 @@ | |||
23 | #include "nvgpu_gpuid_t19x.h" | 23 | #include "nvgpu_gpuid_t19x.h" |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #include <nvgpu/log.h> | ||
27 | |||
26 | int gpu_init_hal(struct gk20a *g) | 28 | int gpu_init_hal(struct gk20a *g) |
27 | { | 29 | { |
28 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; | 30 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; |
@@ -54,7 +56,7 @@ int gpu_init_hal(struct gk20a *g) | |||
54 | break; | 56 | break; |
55 | #endif | 57 | #endif |
56 | default: | 58 | default: |
57 | gk20a_err(g->dev, "no support for %x", ver); | 59 | nvgpu_err(g, "no support for %x", ver); |
58 | return -ENODEV; | 60 | return -ENODEV; |
59 | } | 61 | } |
60 | 62 | ||