From 14959cf6829f13180eb27015ca2db83a817c1add Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 12:18:13 -0700 Subject: 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 Reviewed-on: http://git-master/r/1457348 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman --- drivers/gpu/nvgpu/gm206/bios_gm206.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gm206/bios_gm206.c') 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) if (g->gpu_characteristics.vbios_version < platform->vbios_min_version) { - gk20a_err(g->dev, "unsupported VBIOS version %08x", + nvgpu_err(g, "unsupported VBIOS version %08x", g->gpu_characteristics.vbios_version); return -EINVAL; } @@ -311,20 +311,20 @@ int gm206_bios_init(struct gk20a *g) d = debugfs_create_blob("bios", S_IRUGO, platform->debugfs, &g->bios_blob); if (!d) - gk20a_err(g->dev, "No debugfs?"); + nvgpu_err(g, "No debugfs?"); gk20a_dbg_fn("done"); err = gm206_bios_devinit(g); if (err) { - gk20a_err(g->dev, "devinit failed"); + nvgpu_err(g, "devinit failed"); return err; } if (platform->run_preos) { err = gm206_bios_preos(g); if (err) { - gk20a_err(g->dev, "pre-os failed"); + nvgpu_err(g, "pre-os failed"); return err; } } -- cgit v1.2.2