2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 476c1dd3..7e1e751b 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -28,7 +28,7 @@ struct gk20a;
 struct fifo_gk20a;
 struct channel_gk20a;
 struct gr_gk20a;
-struct sim_gk20a;
+struct sim_nvgpu;
 struct gk20a_ctxsw_ucode_segments;
 struct gk20a_fecs_trace;
 struct gk20a_ctxsw_trace;
@@ -1287,7 +1287,7 @@ struct gk20a {
        struct fifo_gk20a fifo;
        struct nvgpu_nvlink_dev nvlink;
        struct gr_gk20a gr;
-        struct sim_gk20a *sim;
+        struct sim_nvgpu *sim;
        struct mm_gk20a mm;
        struct nvgpu_pmu pmu;
        struct acr_desc acr;
diff --git a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
index fb64d959..e74d33d5 100644
--- a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
@@ -28,7 +28,7 @@
 struct gk20a;
-struct sim_gk20a {
+struct sim_nvgpu {
        struct gk20a *g;
        u32 send_ring_put;
        u32 recv_ring_get;
@@ -37,7 +37,7 @@ struct sim_gk20a {
        struct nvgpu_mem send_bfr;
        struct nvgpu_mem recv_bfr;
        struct nvgpu_mem msg_bfr;
-        void (*remove_support)(struct sim_gk20a *);
+        void (*remove_support)(struct gk20a *);
        int (*esc_readl)(
                struct gk20a *g, char *path, u32 index, u32 *data);
 };

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 476c1dd3..7e1e751b 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -28,7 +28,7 @@ struct gk20a;
28	struct fifo_gk20a;	28	struct fifo_gk20a;
29	struct channel_gk20a;	29	struct channel_gk20a;
30	struct gr_gk20a;	30	struct gr_gk20a;
31	struct sim_gk20a;	31	struct sim_nvgpu;
32	struct gk20a_ctxsw_ucode_segments;	32	struct gk20a_ctxsw_ucode_segments;
33	struct gk20a_fecs_trace;	33	struct gk20a_fecs_trace;
34	struct gk20a_ctxsw_trace;	34	struct gk20a_ctxsw_trace;
@@ -1287,7 +1287,7 @@ struct gk20a {
1287	struct fifo_gk20a fifo;	1287	struct fifo_gk20a fifo;
1288	struct nvgpu_nvlink_dev nvlink;	1288	struct nvgpu_nvlink_dev nvlink;
1289	struct gr_gk20a gr;	1289	struct gr_gk20a gr;
1290	struct sim_gk20a *sim;	1290	struct sim_nvgpu *sim;
1291	struct mm_gk20a mm;	1291	struct mm_gk20a mm;
1292	struct nvgpu_pmu pmu;	1292	struct nvgpu_pmu pmu;
1293	struct acr_desc acr;	1293	struct acr_desc acr;


diff --git a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h index fb64d959..e74d33d5 100644 --- a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
@@ -28,7 +28,7 @@
28		28
29	struct gk20a;	29	struct gk20a;
30		30
31	struct sim_gk20a {	31	struct sim_nvgpu {
32	struct gk20a *g;	32	struct gk20a *g;
33	u32 send_ring_put;	33	u32 send_ring_put;
34	u32 recv_ring_get;	34	u32 recv_ring_get;
@@ -37,7 +37,7 @@ struct sim_gk20a {
37	struct nvgpu_mem send_bfr;	37	struct nvgpu_mem send_bfr;
38	struct nvgpu_mem recv_bfr;	38	struct nvgpu_mem recv_bfr;
39	struct nvgpu_mem msg_bfr;	39	struct nvgpu_mem msg_bfr;
40	void (remove_support)(struct sim_gk20a );	40	void (remove_support)(struct gk20a );
41	int (*esc_readl)(	41	int (*esc_readl)(
42	struct gk20a g, char path, u32 index, u32 *data);	42	struct gk20a g, char path, u32 index, u32 *data);
43	};	43	};