4 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index 8a0be106..79f90f0b 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -1257,7 +1257,7 @@ static int gm20b_init_pmu_setup_hw1(struct gk20a *g,
 
         struct pmu_gk20a *pmu = &g->pmu;
         int err;
-        struct gk20a_platform *platform = platform_get_drvdata(g->dev);
+        struct gk20a_platform *platform = dev_get_drvdata(g->dev);
 
         gk20a_dbg_fn("");
 
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
index 16f929a8..54406008 100644
--- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
@@ -1,7 +1,7 @@
 /*
  * GM20B Clocks
  *
- * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -1651,7 +1651,7 @@ static const struct file_operations pll_param_fops = {
 static int clk_gm20b_debugfs_init(struct gk20a *g)
 {
         struct dentry *d;
-        struct gk20a_platform *platform = platform_get_drvdata(g->dev);
+        struct gk20a_platform *platform = dev_get_drvdata(g->dev);
 
         d = debugfs_create_file(
                 "rate", S_IRUGO|S_IWUSR, platform->debugfs, g, &rate_fops);
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index ffc36903..e4e27764 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -112,7 +112,7 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
 
         gk20a_dbg_fn("");
 
-        trace_gk20a_ltc_cbc_ctrl_start(g->dev->name, op, min, max);
+        trace_gk20a_ltc_cbc_ctrl_start(dev_name(g->dev), 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(g->dev->name);
+        trace_gk20a_ltc_cbc_ctrl_done(dev_name(g->dev));
         mutex_unlock(&g->mm.l2_op_lock);
         return err;
 }
@@ -230,7 +230,7 @@ void gm20b_ltc_g_elpg_flush_locked(struct gk20a *g)
 
         gk20a_dbg_fn("");
 
-        trace_gk20a_mm_g_elpg_flush_locked(g->dev->name);
+        trace_gk20a_mm_g_elpg_flush_locked(dev_name(g->dev));
 
         for (i = 0; i < g->ltc_count; i++)
                 done[i] = 0;
@@ -264,7 +264,7 @@ void gm20b_ltc_g_elpg_flush_locked(struct gk20a *g)
                 gk20a_warn(dev_from_gk20a(g),
                             "g_elpg_flush too many retries");
 
-        trace_gk20a_mm_g_elpg_flush_locked_done(g->dev->name);
+        trace_gk20a_mm_g_elpg_flush_locked_done(dev_name(g->dev));
 }
 
 u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base)
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
index 621ee687..7bc19972 100644
--- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
@@ -1,7 +1,7 @@
 /*
  * GM20B MMU
  *
- * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -52,7 +52,7 @@ int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g)
 
         gk20a_busy_noresume(g->dev);
 #ifdef CONFIG_PM
-        if (!pm_runtime_active(&g->dev->dev))
+        if (!pm_runtime_active(g->dev))
                 goto fail;
 #endif
 
@@ -67,7 +67,7 @@ int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g)
         ret = gm20b_mm_mmu_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT);
 
 fail:
-        pm_runtime_put(&g->dev->dev);
+        pm_runtime_put(g->dev);
         return ret;
 }