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/bus_gk20a.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/bus_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/bus_gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c index dd96df16..3119e373 100644 --- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <soc/tegra/chip-id.h> | 17 | #include <soc/tegra/chip-id.h> |
18 | 18 | ||
19 | #include <nvgpu/page_allocator.h> | 19 | #include <nvgpu/page_allocator.h> |
20 | #include <nvgpu/log.h> | ||
20 | 21 | ||
21 | #include "gk20a.h" | 22 | #include "gk20a.h" |
22 | 23 | ||
@@ -126,7 +127,7 @@ int gk20a_read_ptimer(struct gk20a *g, u64 *value) | |||
126 | } | 127 | } |
127 | 128 | ||
128 | /* too many iterations, bail out */ | 129 | /* too many iterations, bail out */ |
129 | gk20a_err(dev_from_gk20a(g), "failed to read ptimer"); | 130 | nvgpu_err(g, "failed to read ptimer"); |
130 | return -EBUSY; | 131 | return -EBUSY; |
131 | } | 132 | } |
132 | 133 | ||