3 files changed, 24 insertions, 21 deletions

diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c
index 03e2eb34..da034b31 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrdev.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c
@@ -140,13 +140,14 @@ static u32 devinit_get_pwr_device_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (g->ops.bios.get_perf_table_ptrs != NULL) {
-                pwr_device_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                g->bios.perf_token, POWER_SENSORS_TABLE);
-                if (pwr_device_table_ptr == NULL) {
-                        status = -EINVAL;
-                        goto done;
-                }
+        if (!g->ops.bios.get_perf_table_ptrs)
+                return -EINVAL;
+
+        pwr_device_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+                        g->bios.perf_token, POWER_SENSORS_TABLE);
+        if (pwr_device_table_ptr == NULL) {
+                status = -EINVAL;
+                goto done;
         }
 
         memcpy(&pwr_sensor_table_header, pwr_device_table_ptr,
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
index c28751fd..f14bac07 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
@@ -187,13 +187,14 @@ static u32 devinit_get_pwr_topology_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (g->ops.bios.get_perf_table_ptrs != NULL) {
-                pwr_topology_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                g->bios.perf_token, POWER_TOPOLOGY_TABLE);
-                if (pwr_topology_table_ptr == NULL) {
-                        status = -EINVAL;
-                        goto done;
-                }
+        if (!g->ops.bios.get_perf_table_ptrs)
+                return -EINVAL;
+
+        pwr_topology_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+                        g->bios.perf_token, POWER_TOPOLOGY_TABLE);
+        if (pwr_topology_table_ptr == NULL) {
+                status = -EINVAL;
+                goto done;
         }
 
         memcpy(&pwr_topology_table_header, pwr_topology_table_ptr,
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
index d7926773..cce3bd5e 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
@@ -466,13 +466,14 @@ static u32 devinit_get_pwr_policy_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (g->ops.bios.get_perf_table_ptrs != NULL) {
-                pwr_policy_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                g->bios.perf_token, POWER_CAPPING_TABLE);
-                if (pwr_policy_table_ptr == NULL) {
-                        status = -EINVAL;
-                        goto done;
-                }
+        if (!g->ops.bios.get_perf_table_ptrs)
+                return -EINVAL;
+
+        pwr_policy_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+                        g->bios.perf_token, POWER_CAPPING_TABLE);
+        if (pwr_policy_table_ptr == NULL) {
+                status = -EINVAL;
+                goto done;
         }
 
         memcpy(&pwr_policy_table_header.version,