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

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c
index 199343e0..4772b628 100644
--- a/drivers/gpu/nvgpu/therm/thrmdev.c
+++ b/drivers/gpu/nvgpu/therm/thrmdev.c
@@ -124,7 +124,7 @@ static u32 devinit_get_therm_device_table(struct gk20a *g,
                                         therm_device_size, therm_device_data.boardobj.type);
 
                 if (!boardobj) {
-                        gk20a_err(dev_from_gk20a(g),
+                        nvgpu_err(g,
                                 "unable to create thermal device for %d type %d",
                                 index, therm_device_data.boardobj.type);
                         status = -EINVAL;
@@ -135,7 +135,7 @@ static u32 devinit_get_therm_device_table(struct gk20a *g,
                                 boardobj, obj_index);
 
                 if (status) {
-                        gk20a_err(dev_from_gk20a(g),
+                        nvgpu_err(g,
                         "unable to insert thermal device boardobj for %d", index);
                         status = -EINVAL;
                         goto done;
@@ -158,7 +158,7 @@ u32 therm_device_sw_setup(struct gk20a *g)
         /* Construct the Super Class and override the Interfaces */
         status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_deviceobjs.super);
         if (status) {
-                gk20a_err(dev_from_gk20a(g),
+                nvgpu_err(g,
                           "error creating boardobjgrp for therm devices, status - 0x%x",
                           status);
                 goto done;
@@ -179,7 +179,7 @@ u32 therm_device_sw_setup(struct gk20a *g)
         status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp,
                         therm, THERM, therm_device, THERM_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;