2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/perf/perf.c b/drivers/gpu/nvgpu/perf/perf.c
index 871ff753..9adcadb6 100644
--- a/drivers/gpu/nvgpu/perf/perf.c
+++ b/drivers/gpu/nvgpu/perf/perf.c
@@ -61,11 +61,15 @@ u32 perf_pmu_vfe_load(struct gk20a *g)
 {
         struct pmu_cmd cmd;
         struct pmu_msg msg;
-        struct pmu_payload payload = { {0} };
+        struct pmu_payload payload;
         u32 status;
         u32 seqdesc;
-        struct nv_pmu_perf_rpc rpccall = {0};
-        struct perfrpc_pmucmdhandler_params handler = {0};
+        struct nv_pmu_perf_rpc rpccall;
+        struct perfrpc_pmucmdhandler_params handler;
+
+        memset(&payload, 0, sizeof(struct pmu_payload));
+        memset(&rpccall, 0, sizeof(struct nv_pmu_perf_rpc));
+        memset(&handler, 0, sizeof(struct perfrpc_pmucmdhandler_params));
 
         /*register call back for future VFE updates*/
         g->ops.perf.handle_pmu_perf_event = pmu_handle_perf_event;
diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/perf/vfe_var.c
index 996929c2..c1f87c25 100644
--- a/drivers/gpu/nvgpu/perf/vfe_var.c
+++ b/drivers/gpu/nvgpu/perf/vfe_var.c
@@ -161,7 +161,7 @@ u32 vfe_var_pmu_setup(struct gk20a *g)
         return status;
 }
 
-u32 dev_init_get_vfield_info(struct gk20a *g,
+static u32 dev_init_get_vfield_info(struct gk20a *g,
         struct vfe_var_single_sensed_fuse *pvfevar)
 {
         u8 *vfieldtableptr = NULL;