3 files changed, 24 insertions, 21 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c
index fe3db5d6..892437de 100644
--- a/drivers/gpu/nvgpu/clk/clk_domain.c
+++ b/drivers/gpu/nvgpu/clk/clk_domain.c
@@ -263,13 +263,14 @@ static u32 devinit_get_clocks_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (g->ops.bios.get_perf_table_ptrs) {
-                clocks_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                g->bios.clock_token, CLOCKS_TABLE);
-                if (clocks_table_ptr == NULL) {
-                        status = -EINVAL;
-                        goto done;
-                }
+        if (!g->ops.bios.get_perf_table_ptrs)
+                return -EINVAL;
+
+        clocks_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+                        g->bios.clock_token, CLOCKS_TABLE);
+        if (clocks_table_ptr == NULL) {
+                status = -EINVAL;
+                goto done;
         }
 
         memcpy(&clocks_table_header, clocks_table_ptr,
diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c
index 0de857f5..d83f3e15 100644
--- a/drivers/gpu/nvgpu/clk/clk_fll.c
+++ b/drivers/gpu/nvgpu/clk/clk_fll.c
@@ -236,13 +236,14 @@ static u32 devinit_get_fll_device_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (g->ops.bios.get_perf_table_ptrs) {
-                fll_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                  g->bios.clock_token, FLL_TABLE);
-                if (fll_table_ptr == NULL) {
-                        status = -1;
-                        goto done;
-                }
+        if (!g->ops.bios.get_perf_table_ptrs)
+                return -EINVAL;
+
+        fll_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+                          g->bios.clock_token, FLL_TABLE);
+        if (fll_table_ptr == NULL) {
+                status = -1;
+                goto done;
         }
 
         memcpy(&fll_desc_table_header_sz, fll_table_ptr,
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c
index e8e4b753..649eb234 100644
--- a/drivers/gpu/nvgpu/clk/clk_vin.c
+++ b/drivers/gpu/nvgpu/clk/clk_vin.c
@@ -339,13 +339,14 @@ static u32 devinit_get_vin_device_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (g->ops.bios.get_perf_table_ptrs) {
-                vin_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                g->bios.clock_token, VIN_TABLE);
-                if (vin_table_ptr == NULL) {
-                        status = -1;
-                        goto done;
-                }
+        if (!g->ops.bios.get_perf_table_ptrs)
+                return -EINVAL;
+
+        vin_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+                        g->bios.clock_token, VIN_TABLE);
+        if (vin_table_ptr == NULL) {
+                status = -1;
+                goto done;
         }
 
         memcpy(&vin_desc_table_header, vin_table_ptr,