gpu: nvgpu: gv11b: Move gops.mc's non-fp members

Move non-function pointer members out of the mc substruct of
gpu_ops. Ideally gpu_ops will have only function ponters, better
matching its intended purpose and improving readability.

gops.mc.intr_mask_restore is now mc_intr_mask_restore

Jira NVGPU-74

Change-Id: I789087704fb5e6338f6010f18457948d0ee6c630
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1509604
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c
index 81e6381f..59263e54 100644
--- a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c
@@ -34,7 +34,7 @@ void mc_gv11b_intr_enable(struct gk20a *g)
                                 0xffffffff);
         gv11b_fb_disable_hub_intr(g, STALL_REG_INDEX, HUB_INTR_TYPE_ALL);
 
-        g->ops.mc.intr_mask_restore[NVGPU_MC_INTR_STALLING] =
+        g->mc_intr_mask_restore[NVGPU_MC_INTR_STALLING] =
                                 mc_intr_pfifo_pending_f() |
                                 mc_intr_hub_pending_f() |
                                 mc_intr_priv_ring_pending_f() |
@@ -42,7 +42,7 @@ void mc_gv11b_intr_enable(struct gk20a *g)
                                 mc_intr_ltc_pending_f() |
                                 eng_intr_mask;
 
-        g->ops.mc.intr_mask_restore[NVGPU_MC_INTR_NONSTALLING] =
+        g->mc_intr_mask_restore[NVGPU_MC_INTR_NONSTALLING] =
                                 mc_intr_pfifo_pending_f()
                              | eng_intr_mask;
 
@@ -50,10 +50,10 @@ void mc_gv11b_intr_enable(struct gk20a *g)
         gv11b_fb_enable_hub_intr(g, STALL_REG_INDEX, g->mm.hub_intr_types);
 
         gk20a_writel(g, mc_intr_en_set_r(NVGPU_MC_INTR_STALLING),
-                        g->ops.mc.intr_mask_restore[NVGPU_MC_INTR_STALLING]);
+                        g->mc_intr_mask_restore[NVGPU_MC_INTR_STALLING]);
 
         gk20a_writel(g, mc_intr_en_set_r(NVGPU_MC_INTR_NONSTALLING),
-                        g->ops.mc.intr_mask_restore[NVGPU_MC_INTR_NONSTALLING]);
+                        g->mc_intr_mask_restore[NVGPU_MC_INTR_NONSTALLING]);
 
 }