5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index b1638b9e..ec18df15 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -984,7 +984,7 @@ static int __exit gk20a_remove(struct platform_device *pdev)
         gk20a_remove_sysfs(dev);
 
         if (platform->secure_buffer.destroy)
-                platform->secure_buffer.destroy(dev,
+                platform->secure_buffer.destroy(g,
                                 &platform->secure_buffer);
 
         if (pm_runtime_enabled(dev))
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index f91e86df..19012bf5 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -695,7 +695,7 @@ struct gpu_ops {
                  * context buffer descriptor (especially fields destroy, sgt,
                  * size).
                  */
-                int (*secure_alloc)(struct device *dev,
+                int (*secure_alloc)(struct gk20a *g,
                                     struct gr_ctx_buffer_desc *desc,
                                     size_t size);
         } mm;
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 7631decf..f101d3ba 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2728,7 +2728,6 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
 {
         struct gr_gk20a *gr = &g->gr;
         int attr_buffer_size, err;
-        struct device *dev = g->dev;
 
         u32 cb_buffer_size = gr->bundle_cb_default_size *
                 gr_scc_bundle_cb_size_div_256b_byte_granularity_v();
@@ -2748,7 +2747,7 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
                 goto clean_up;
 
         if (g->ops.mm.secure_alloc)
-                g->ops.mm.secure_alloc(dev,
+                g->ops.mm.secure_alloc(g,
                                        &gr->global_ctx_buffer[CIRCULAR_VPR],
                                        cb_buffer_size);
 
@@ -2760,7 +2759,7 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
                 goto clean_up;
 
         if (g->ops.mm.secure_alloc)
-                g->ops.mm.secure_alloc(dev,
+                g->ops.mm.secure_alloc(g,
                                        &gr->global_ctx_buffer[PAGEPOOL_VPR],
                                        pagepool_buffer_size);
 
@@ -2772,7 +2771,7 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
                 goto clean_up;
 
         if (g->ops.mm.secure_alloc)
-                g->ops.mm.secure_alloc(dev,
+                g->ops.mm.secure_alloc(g,
                                        &gr->global_ctx_buffer[ATTRIBUTE_VPR],
                                        attr_buffer_size);
 
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
index 9499f91a..72322e54 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
@@ -31,7 +31,7 @@ struct gr_ctx_buffer_desc;
 struct gk20a_scale_profile;
 
 struct secure_page_buffer {
-        void (*destroy)(struct device *, struct secure_page_buffer *);
+        void (*destroy)(struct gk20a *, struct secure_page_buffer *);
         size_t size;
         u64 iova;
 };
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
index c4216ffc..b0f6ee7d 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
@@ -95,7 +95,7 @@ static inline void __maybe_unused pmc_write(u32 val, unsigned long reg)
 #define MHZ_TO_HZ(x) ((x) * 1000000)
 #define HZ_TO_MHZ(x) ((x) / 1000000)
 
-static void gk20a_tegra_secure_page_destroy(struct device *dev,
+static void gk20a_tegra_secure_page_destroy(struct gk20a *g,
                                        struct secure_page_buffer *secure_buffer)
 {
         DEFINE_DMA_ATTRS(attrs);
@@ -148,10 +148,11 @@ static void gk20a_tegra_secure_destroy(struct gk20a *g,
         }
 }
 
-static int gk20a_tegra_secure_alloc(struct device *dev,
+static int gk20a_tegra_secure_alloc(struct gk20a *g,
                              struct gr_ctx_buffer_desc *desc,
                              size_t size)
 {
+        struct device *dev = dev_from_gk20a(g);
         struct gk20a_platform *platform = dev_get_drvdata(dev);
         DEFINE_DMA_ATTRS(attrs);
         dma_addr_t iova;
@@ -187,7 +188,7 @@ static int gk20a_tegra_secure_alloc(struct device *dev,
         desc->mem.aperture = APERTURE_SYSMEM;
 
         if (platform->secure_buffer.destroy)
-                platform->secure_buffer.destroy(dev, &platform->secure_buffer);
+                platform->secure_buffer.destroy(g, &platform->secure_buffer);
 
         return err;