diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-06 15:18:13 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-07 16:48:24 -0400 |
commit | 14959cf6829f13180eb27015ca2db83a817c1add (patch) | |
tree | a50e0220a34becfc7bfc16c3ec2ac6a75300818f /drivers/gpu/nvgpu/gm206/bios_gm206.c | |
parent | 1add126551309a323ae422be41c9db2203bbe112 (diff) |
gpu: nvgpu: gm206: 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: Ie5b3b7bd25327e8ed595cfc60ede7a013025fdaf
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457348
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm206/bios_gm206.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm206/bios_gm206.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index b7260218..0c4d3e4f 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c | |||
@@ -300,7 +300,7 @@ int gm206_bios_init(struct gk20a *g) | |||
300 | 300 | ||
301 | if (g->gpu_characteristics.vbios_version < | 301 | if (g->gpu_characteristics.vbios_version < |
302 | platform->vbios_min_version) { | 302 | platform->vbios_min_version) { |
303 | gk20a_err(g->dev, "unsupported VBIOS version %08x", | 303 | nvgpu_err(g, "unsupported VBIOS version %08x", |
304 | g->gpu_characteristics.vbios_version); | 304 | g->gpu_characteristics.vbios_version); |
305 | return -EINVAL; | 305 | return -EINVAL; |
306 | } | 306 | } |
@@ -311,20 +311,20 @@ int gm206_bios_init(struct gk20a *g) | |||
311 | d = debugfs_create_blob("bios", S_IRUGO, platform->debugfs, | 311 | d = debugfs_create_blob("bios", S_IRUGO, platform->debugfs, |
312 | &g->bios_blob); | 312 | &g->bios_blob); |
313 | if (!d) | 313 | if (!d) |
314 | gk20a_err(g->dev, "No debugfs?"); | 314 | nvgpu_err(g, "No debugfs?"); |
315 | 315 | ||
316 | gk20a_dbg_fn("done"); | 316 | gk20a_dbg_fn("done"); |
317 | 317 | ||
318 | err = gm206_bios_devinit(g); | 318 | err = gm206_bios_devinit(g); |
319 | if (err) { | 319 | if (err) { |
320 | gk20a_err(g->dev, "devinit failed"); | 320 | nvgpu_err(g, "devinit failed"); |
321 | return err; | 321 | return err; |
322 | } | 322 | } |
323 | 323 | ||
324 | if (platform->run_preos) { | 324 | if (platform->run_preos) { |
325 | err = gm206_bios_preos(g); | 325 | err = gm206_bios_preos(g); |
326 | if (err) { | 326 | if (err) { |
327 | gk20a_err(g->dev, "pre-os failed"); | 327 | nvgpu_err(g, "pre-os failed"); |
328 | return err; | 328 | return err; |
329 | } | 329 | } |
330 | } | 330 | } |