diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-06 15:09:01 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-07 16:48:24 -0400 |
commit | 86ecddf68734e4a938eda351f4dde11ab507de3f (patch) | |
tree | 3a8d89ace77fc3427da6243c81f224883954e8e9 /drivers/gpu/nvgpu/gp106/clk_gp106.c | |
parent | bb72b7e2ed215b26e1d9b94534c24ab4cfa52801 (diff) |
gpu: nvgpu: gp106: 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: I18955b4c46c082883ee0bf589ab17cd66ab0add2
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457346
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/clk_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/clk_gp106.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c index 8bc47ead..262fd63c 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c | |||
@@ -192,8 +192,7 @@ static u32 gp106_get_rate_cntr(struct gk20a *g, struct namemap_cfg *c) { | |||
192 | } while ((--retries) && (cntr = gk20a_readl(g, c->cntr.reg_cntr_addr))); | 192 | } while ((--retries) && (cntr = gk20a_readl(g, c->cntr.reg_cntr_addr))); |
193 | 193 | ||
194 | if (!retries) { | 194 | if (!retries) { |
195 | gk20a_err(dev_from_gk20a(g), | 195 | nvgpu_err(g, "unable to settle counter reset, bailing"); |
196 | "unable to settle counter reset, bailing"); | ||
197 | goto read_err; | 196 | goto read_err; |
198 | } | 197 | } |
199 | /* Program counter */ | 198 | /* Program counter */ |