5 files changed, 44 insertions, 22 deletions

diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/pmgr/pmgr.c
index 6be0f82f..227a9893 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgr.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgr.c
@@ -30,9 +30,10 @@ int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val)
         int status;
 
         status = pmgr_pmu_pwr_devices_query_blocking(g, 1, &payload);
-        if (status)
+        if (status) {
                 nvgpu_err(g, "pmgr_pwr_devices_get_current_power failed %x",
                         status);
+        }
 
         *val = payload.devices[0].powerm_w;
 
@@ -45,9 +46,10 @@ int pmgr_pwr_devices_get_current(struct gk20a *g, u32 *val)
         int status;
 
         status = pmgr_pmu_pwr_devices_query_blocking(g, 1, &payload);
-        if (status)
+        if (status) {
                 nvgpu_err(g, "pmgr_pwr_devices_get_current failed %x",
                         status);
+        }
 
         *val = payload.devices[0].currentm_a;
 
@@ -60,9 +62,10 @@ int pmgr_pwr_devices_get_voltage(struct gk20a *g, u32 *val)
         int status;
 
         status = pmgr_pmu_pwr_devices_query_blocking(g, 1, &payload);
-        if (status)
+        if (status) {
                 nvgpu_err(g, "pmgr_pwr_devices_get_current_voltage failed %x",
                         status);
+        }
 
         *val = payload.devices[0].voltageu_v;
 
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
index 69c43a01..d0c0e763 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
@@ -168,9 +168,10 @@ static u32 pmgr_send_i2c_device_topology_to_pmu(struct gk20a *g)
                                 PMU_CMD_SUBMIT_PAYLOAD_PARAMS_FB_SIZE_UNUSED,
                                 &i2c_desc_table);
 
-        if (status)
+        if (status) {
                 nvgpu_err(g, "pmgr_pmu_set_object failed %x",
                         status);
+        }
 
         return status;
 }
@@ -183,8 +184,9 @@ static int pmgr_send_pwr_device_topology_to_pmu(struct gk20a *g)
 
         /* Set the BA-device-independent HW information */
         pwr_desc_table = nvgpu_kzalloc(g, sizeof(*pwr_desc_table));
-        if (!pwr_desc_table)
+        if (!pwr_desc_table) {
                 return -ENOMEM;
+        }
 
         ppwr_desc_header = &(pwr_desc_table->hdr.data);
         ppwr_desc_header->ba_info.b_initialized_and_used = false;
@@ -212,9 +214,10 @@ static int pmgr_send_pwr_device_topology_to_pmu(struct gk20a *g)
                                 (u16)sizeof(struct nv_pmu_pmgr_pwr_device_desc_table),
                                 pwr_desc_table);
 
-        if (status)
+        if (status) {
                 nvgpu_err(g, "pmgr_pmu_set_object failed %x",
                         status);
+        }
 
 exit:
         nvgpu_kfree(g, pwr_desc_table);
@@ -230,8 +233,9 @@ static int pmgr_send_pwr_mointer_to_pmu(struct gk20a *g)
         int status = 0;
 
         pwr_monitor_pack = nvgpu_kzalloc(g, sizeof(*pwr_monitor_pack));
-        if (!pwr_monitor_pack)
+        if (!pwr_monitor_pack) {
                 return -ENOMEM;
+        }
 
         /* Copy all the global settings from the RM copy */
         pwr_channel_hdr = &(pwr_monitor_pack->channels.hdr.data);
@@ -281,9 +285,10 @@ static int pmgr_send_pwr_mointer_to_pmu(struct gk20a *g)
                                 (u16)sizeof(struct nv_pmu_pmgr_pwr_monitor_pack),
                                 pwr_monitor_pack);
 
-        if (status)
+        if (status) {
                 nvgpu_err(g, "pmgr_pmu_set_object failed %x",
                         status);
+        }
 
 exit:
         nvgpu_kfree(g, pwr_monitor_pack);
@@ -365,9 +370,10 @@ static int pmgr_send_pwr_policy_to_pmu(struct gk20a *g)
                                 (u16)sizeof(struct nv_pmu_pmgr_pwr_policy_pack),
                                 ppwrpack);
 
-        if (status)
+        if (status) {
                 nvgpu_err(g, "pmgr_pmu_set_object failed %x",
                         status);
+        }
 
 exit:
         if (ppwrpack) {
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c
index 235629d6..90d39610 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrdev.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c
@@ -40,8 +40,9 @@ static int _pwr_device_pmudata_instget(struct gk20a *g,
 
         /*check whether pmuboardobjgrp has a valid boardobj in index*/
         if (((u32)BIT(idx) &
-                ppmgrdevice->hdr.data.super.obj_mask.super.data[0]) == 0)
+                ppmgrdevice->hdr.data.super.obj_mask.super.data[0]) == 0) {
                 return -EINVAL;
+        }
 
         *ppboardobjpmudata = (struct nv_pmu_boardobj *)
                 &ppmgrdevice->devices[idx].data.board_obj;
@@ -99,8 +100,9 @@ static struct boardobj *construct_pwr_device(struct gk20a *g,
 
         status = boardobj_construct_super(g, &board_obj_ptr,
                 pargs_size, pargs);
-        if (status)
+        if (status) {
                 return NULL;
+        }
 
         pwrdev = (struct pwr_device_ina3221*)board_obj_ptr;
 
@@ -250,8 +252,9 @@ static int devinit_get_pwr_device_table(struct gk20a *g,
                                 pwr_device_data.ina3221.curr_correct_m = (1 << 12);
                         }
                         pwr_device_size = sizeof(struct pwr_device_ina3221);
-                } else
+                } else {
                         continue;
+                }
 
                 pwr_device_data.boardobj.type = CTRL_PMGR_PWR_DEVICE_TYPE_INA3221;
                 pwr_device_data.pwrdev.power_rail = (u8)0;
@@ -306,8 +309,9 @@ int pmgr_device_sw_setup(struct gk20a *g)
         pboardobjgrp->pmudatainstget = _pwr_device_pmudata_instget;
 
         status = devinit_get_pwr_device_table(g, ppwrdeviceobjs);
-        if (status)
+        if (status) {
                 goto done;
+        }
 
 done:
         nvgpu_log_info(g, " done status %x", status);
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
index 53c7a1c4..9b2f91de 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
@@ -40,8 +40,9 @@ static int _pwr_channel_pmudata_instget(struct gk20a *g,
 
         /*check whether pmuboardobjgrp has a valid boardobj in index*/
         if (((u32)BIT(idx) &
-                ppmgrchannel->hdr.data.super.obj_mask.super.data[0]) == 0)
+                ppmgrchannel->hdr.data.super.obj_mask.super.data[0]) == 0) {
                 return -EINVAL;
+        }
 
         *ppboardobjpmudata = (struct nv_pmu_boardobj *)
                 &ppmgrchannel->channels[idx].data.board_obj;
@@ -66,8 +67,9 @@ static int _pwr_channel_rels_pmudata_instget(struct gk20a *g,
 
         /*check whether pmuboardobjgrp has a valid boardobj in index*/
         if (((u32)BIT(idx) &
-                ppmgrchrels->hdr.data.super.obj_mask.super.data[0]) == 0)
+                ppmgrchrels->hdr.data.super.obj_mask.super.data[0]) == 0) {
                 return -EINVAL;
+        }
 
         *ppboardobjpmudata = (struct nv_pmu_boardobj *)
                 &ppmgrchrels->ch_rels[idx].data.board_obj;
@@ -150,8 +152,9 @@ static struct boardobj *construct_pwr_topology(struct gk20a *g,
 
         status = boardobj_construct_super(g, &board_obj_ptr,
                 pargs_size, pargs);
-        if (status)
+        if (status) {
                 return NULL;
+        }
 
         pwrchannel = (struct pwr_channel_sensor*)board_obj_ptr;
 
@@ -253,8 +256,9 @@ static int devinit_get_pwr_topology_table(struct gk20a *g,
                                 NV_VBIOS_POWER_TOPOLOGY_2X_ENTRY_PARAM1_SENSOR_PROVIDER_INDEX);
 
                         pwr_topology_size = sizeof(struct pwr_channel_sensor);
-                } else
+                } else {
                         continue;
+                }
 
                 /* Initialize data for the parent class */
                 pwr_topology_data.boardobj.type = CTRL_PMGR_PWR_CHANNEL_TYPE_SENSOR;
@@ -345,12 +349,14 @@ int pmgr_monitor_sw_setup(struct gk20a *g)
         ppwrmonitorobjs = &(g->pmgr_pmu.pmgr_monitorobjs);
 
         status = devinit_get_pwr_topology_table(g, ppwrmonitorobjs);
-        if (status)
+        if (status) {
                 goto done;
+        }
 
         status = _pwr_channel_state_init(g);
-        if (status)
+        if (status) {
                 goto done;
+        }
 
         /* Initialise physicalChannelMask */
         g->pmgr_pmu.pmgr_monitorobjs.physical_channel_mask = 0;
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
index 13a94e4f..d3fd941e 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
@@ -264,8 +264,9 @@ static struct boardobj *construct_pwr_policy(struct gk20a *g,
 
         status = boardobj_construct_super(g, &board_obj_ptr,
                 pargs_size, pargs);
-        if (status)
+        if (status) {
                 return NULL;
+        }
 
         pwrpolicyhwthreshold = (struct pwr_policy_hw_threshold*)board_obj_ptr;
         pwrpolicy = (struct pwr_policy *)board_obj_ptr;
@@ -575,8 +576,9 @@ static int devinit_get_pwr_policy_table(struct gk20a *g,
                         packed_entry->flags0,
                         NV_VBIOS_POWER_POLICY_3X_ENTRY_FLAGS0_CLASS);
 
-                if (class_type != NV_VBIOS_POWER_POLICY_3X_ENTRY_FLAGS0_CLASS_HW_THRESHOLD)
+                if (class_type != NV_VBIOS_POWER_POLICY_3X_ENTRY_FLAGS0_CLASS_HW_THRESHOLD) {
                         continue;
+                }
 
                 /* unpack power policy table entry */
                 devinit_unpack_pwr_policy_entry(&entry, packed_entry);
@@ -759,8 +761,9 @@ int pmgr_policy_sw_setup(struct gk20a *g)
         pboardobjgrp = &(g->pmgr_pmu.pmgr_policyobjs.pwr_policies.super);
 
         status = devinit_get_pwr_policy_table(g, ppwrpolicyobjs);
-        if (status)
+        if (status) {
                 goto done;
+        }
 
         g->pmgr_pmu.pmgr_policyobjs.b_enabled = true;