gpu: nvgpu: clk: 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: I58bb9e2fb7e5b18f74fbb92b70150cce97968fc3
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457347
Reviewed-by: Alex Waterman <alexw@nvidia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c
index af388671..0fceb89d 100644
--- a/drivers/gpu/nvgpu/clk/clk_vin.c
+++ b/drivers/gpu/nvgpu/clk/clk_vin.c
@@ -252,7 +252,7 @@ u32 clk_vin_sw_setup(struct gk20a *g)
 
         status = boardobjgrpconstruct_e32(&g->clk_pmu.avfs_vinobjs.super);
         if (status) {
-                gk20a_err(dev_from_gk20a(g),
+                nvgpu_err(g,
                         "error creating boardobjgrp for clk vin, statu - 0x%x",
                         status);
                 goto done;
@@ -266,7 +266,7 @@ u32 clk_vin_sw_setup(struct gk20a *g)
         status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp,
                         clk, CLK, clk_vin_device, CLK_VIN_DEVICE);
         if (status) {
-                gk20a_err(dev_from_gk20a(g),
+                nvgpu_err(g,
                         "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x",
                         status);
                 goto done;
@@ -290,7 +290,7 @@ u32 clk_vin_sw_setup(struct gk20a *g)
                         status = read_vin_cal_slope_intercept_fuse(g,
                                         pvindev->id, &slope, &intercept);
                         if (status) {
-                                gk20a_err(dev_from_gk20a(g),
+                                nvgpu_err(g,
                                 "err reading vin cal for id %x", pvindev->id);
                                 goto done;
                         }
@@ -304,7 +304,7 @@ u32 clk_vin_sw_setup(struct gk20a *g)
                                 &g->clk_pmu.avfs_vinobjs.super.super,
                                 clk, CLK, clk_vin_device, CLK_VIN_DEVICE);
         if (status) {
-                gk20a_err(dev_from_gk20a(g),
+                nvgpu_err(g,
                         "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x",
                         status);
                 goto done;