3 files changed, 15 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c
index 7d196422..8130656c 100644
--- a/drivers/gpu/nvgpu/therm/thrmchannel.c
+++ b/drivers/gpu/nvgpu/therm/thrmchannel.c
@@ -73,8 +73,9 @@ static struct boardobj *construct_channel_device(struct gk20a *g,
 
         status = boardobj_construct_super(g, &board_obj_ptr,
                 pargs_size, pargs);
-        if (status)
+        if (status) {
                 return NULL;
+        }
 
         /* Set Super class interfaces */
         board_obj_ptr->pmudatainit = _therm_channel_pmudatainit_device;
@@ -108,8 +109,9 @@ static int _therm_channel_pmudata_instget(struct gk20a *g,
 
         /*check whether pmuboardobjgrp has a valid boardobj in index*/
         if (((u32)BIT(idx) &
-                        pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0)
+                        pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) {
                 return -EINVAL;
+        }
 
         *ppboardobjpmudata = (struct nv_pmu_boardobj *)
                 &pgrp_set->objects[idx].data.board_obj;
@@ -233,8 +235,9 @@ int therm_channel_sw_setup(struct gk20a *g)
         pboardobjgrp->pmudatainstget = _therm_channel_pmudata_instget;
 
         status = devinit_get_therm_channel_table(g, pthermchannelobjs);
-        if (status)
+        if (status) {
                 goto done;
+        }
 
         BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, THERM, THERM_CHANNEL);
 
diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c
index ddd1f280..b0e65af7 100644
--- a/drivers/gpu/nvgpu/therm/thrmdev.c
+++ b/drivers/gpu/nvgpu/therm/thrmdev.c
@@ -43,8 +43,9 @@ static int _therm_device_pmudata_instget(struct gk20a *g,
 
         /*check whether pmuboardobjgrp has a valid boardobj in index*/
         if (((u32)BIT(idx) &
-                        pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0)
+                        pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) {
                 return -EINVAL;
+        }
 
         *ppboardobjpmudata = (struct nv_pmu_boardobj *)
                 &pgrp_set->objects[idx].data;
@@ -208,8 +209,9 @@ static struct boardobj *therm_device_construct(struct gk20a *g,
                 board_obj_ptr = NULL;
                 nvgpu_err(g,
                         "could not allocate memory for therm_device");
-                if (board_obj_ptr != NULL)
+                if (board_obj_ptr != NULL) {
                         nvgpu_kfree(g, board_obj_ptr);
+                }
         }
 
 
@@ -347,8 +349,9 @@ int therm_device_sw_setup(struct gk20a *g)
         pboardobjgrp->pmudatainstget = _therm_device_pmudata_instget;
 
         status = devinit_get_therm_device_table(g, pthermdeviceobjs);
-        if (status)
+        if (status) {
                 goto done;
+        }
 
         BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, THERM, THERM_DEVICE);
 
diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.c b/drivers/gpu/nvgpu/therm/thrmpmu.c
index 7814cf5e..e23d1d63 100644
--- a/drivers/gpu/nvgpu/therm/thrmpmu.c
+++ b/drivers/gpu/nvgpu/therm/thrmpmu.c
@@ -43,11 +43,12 @@ static void therm_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg,
                 return;
         }
 
-        if (!phandlerparams->prpccall->b_supported)
+        if (!phandlerparams->prpccall->b_supported) {
                 nvgpu_err(g, "RPC msg %x failed",
                         msg->msg.pmgr.msg_type);
-        else
+        } else {
                 phandlerparams->success = 1;
+        }
 }
 
 int therm_send_pmgr_tables_to_pmu(struct gk20a *g)