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

2 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/lpwr/lpwr.c b/drivers/gpu/nvgpu/lpwr/lpwr.c
index b722a900..9ff7c2a7 100644
--- a/drivers/gpu/nvgpu/lpwr/lpwr.c
+++ b/drivers/gpu/nvgpu/lpwr/lpwr.c
@@ -201,7 +201,7 @@ static void nvgpu_pmu_handle_param_lpwr_msg(struct gk20a *g,
         gk20a_dbg_fn("");
 
         if (status != 0) {
-                gk20a_err(dev_from_gk20a(g), "LWPR PARAM cmd aborted");
+                nvgpu_err(g, "LWPR PARAM cmd aborted");
                 return;
         }
 
@@ -252,7 +252,7 @@ int nvgpu_lwpr_mclk_change(struct gk20a *g, u32 pstate)
                         &ack_status, 1);
                 if (ack_status == 0) {
                         status = -EINVAL;
-                        gk20a_err(dev_from_gk20a(g), "MCLK-CHANGE ACK failed");
+                        nvgpu_err(g, "MCLK-CHANGE ACK failed");
                 }
         }
 
@@ -285,7 +285,7 @@ u32 nvgpu_lpwr_post_init(struct gk20a *g)
                 &ack_status, 1);
         if (ack_status == 0) {
                 status = -EINVAL;
-                gk20a_err(dev_from_gk20a(g), "post-init ack failed");
+                nvgpu_err(g, "post-init ack failed");
         }
 
         return status;
diff --git a/drivers/gpu/nvgpu/lpwr/rppg.c b/drivers/gpu/nvgpu/lpwr/rppg.c
index e90fd7f9..59948f35 100644
--- a/drivers/gpu/nvgpu/lpwr/rppg.c
+++ b/drivers/gpu/nvgpu/lpwr/rppg.c
@@ -68,7 +68,7 @@ static u32 rppg_send_cmd(struct gk20a *g, struct nv_pmu_rppg_cmd *prppg_cmd)
                         prppg_cmd->stats_reset.ctrl_id;
                 break;
         default:
-                gk20a_err(dev_from_gk20a(g), "Inivalid RPPG command %d",
+                nvgpu_err(g, "Inivalid RPPG command %d",
                         prppg_cmd->cmn.cmd_id);
                 return -1;
         }
@@ -76,7 +76,7 @@ static u32 rppg_send_cmd(struct gk20a *g, struct nv_pmu_rppg_cmd *prppg_cmd)
         status = gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ,
                         pmu_handle_rppg_init_msg, &success, &seq, ~0);
         if (status) {
-                gk20a_err(dev_from_gk20a(g), "Unable to submit parameter command %d",
+                nvgpu_err(g, "Unable to submit parameter command %d",
                         prppg_cmd->cmn.cmd_id);
                 goto exit;
         }
@@ -86,7 +86,7 @@ static u32 rppg_send_cmd(struct gk20a *g, struct nv_pmu_rppg_cmd *prppg_cmd)
                         &success, 1);
                 if (success == 0) {
                         status = -EINVAL;
-                        gk20a_err(dev_from_gk20a(g), "Ack for the parameter command %x",
+                        nvgpu_err(g, "Ack for the parameter command %x",
                                 prppg_cmd->cmn.cmd_id);
                 }
         }
@@ -127,7 +127,7 @@ u32 init_rppg(struct gk20a *g)
 
         status = rppg_init(g);
         if (status != 0) {
-                gk20a_err(dev_from_gk20a(g),
+                nvgpu_err(g,
                         "Failed to initialize RPPG in PMU: 0x%08x", status);
                 return status;
         }
@@ -135,7 +135,7 @@ u32 init_rppg(struct gk20a *g)
 
         status = rppg_ctrl_init(g, NV_PMU_RPPG_CTRL_ID_GR);
         if (status != 0) {
-                gk20a_err(dev_from_gk20a(g),
+                nvgpu_err(g,
                         "Failed to initialize RPPG_CTRL: GR in PMU: 0x%08x",
                         status);
                 return status;
@@ -143,7 +143,7 @@ u32 init_rppg(struct gk20a *g)
 
         status = rppg_ctrl_init(g, NV_PMU_RPPG_CTRL_ID_MS);
         if (status != 0) {
-                gk20a_err(dev_from_gk20a(g),
+                nvgpu_err(g,
                         "Failed to initialize RPPG_CTRL: MS in PMU: 0x%08x",
                         status);
                 return status;