3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
index 07b5d454..d6eec0a5 100644
--- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
@@ -1619,7 +1619,7 @@ static int pll_reg_show(struct seq_file *s, void *data)
         nvgpu_mutex_acquire(&g->clk.clk_mutex);
         if (!g->clk.clk_hw_on) {
                 seq_printf(s, "%s powered down - no access to registers\n",
-                           dev_name(dev_from_gk20a(g)));
+                           g->name);
                 nvgpu_mutex_release(&g->clk.clk_mutex);
                 return 0;
         }
@@ -1666,7 +1666,7 @@ static int pll_reg_raw_show(struct seq_file *s, void *data)
         nvgpu_mutex_acquire(&g->clk.clk_mutex);
         if (!g->clk.clk_hw_on) {
                 seq_printf(s, "%s powered down - no access to registers\n",
-                           dev_name(dev_from_gk20a(g)));
+                           g->name);
                 nvgpu_mutex_release(&g->clk.clk_mutex);
                 return 0;
         }
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 684f5731..5e19a5ae 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -237,7 +237,7 @@ int gm20b_init_hal(struct gk20a *g)
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gk20a_init_css_ops(gops);
 #endif
-        gops->name = "gm20b";
+        g->name = "gm20b";
         gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics;
         gops->get_litter_value = gm20b_get_litter_value;
 
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 8c1be1d1..a2c46600 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -115,7 +115,7 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
 
         gk20a_dbg_fn("");
 
-        trace_gk20a_ltc_cbc_ctrl_start(dev_name(g->dev), op, min, max);
+        trace_gk20a_ltc_cbc_ctrl_start(g->name, op, min, max);
 
         if (gr->compbit_store.mem.size == 0)
                 return 0;
@@ -162,7 +162,7 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
                 }
         }
 out:
-        trace_gk20a_ltc_cbc_ctrl_done(dev_name(g->dev));
+        trace_gk20a_ltc_cbc_ctrl_done(g->name);
         nvgpu_mutex_release(&g->mm.l2_op_lock);
         return err;
 }