gpu: nvgpu: cleanup return types for MISRA 10.3

This is a big cleanup of return types across a number of modules in the
nvgpu driver. Many functions were returning u32 but using negative
return codes. This is a MISRA 10.3 violation by assigning signed values
to a u32.

JIRA NVGPU-647

Change-Id: I59ee66706321f5b5b1a07ed8c24b81583e9ba28c
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1810743
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

10 files changed, 81 insertions, 76 deletions

diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c
index 5f726935..b7892c78 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobj.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobj.c
@@ -26,7 +26,7 @@
 #include "boardobj.h"
 #include "ctrl/ctrlboardobj.h"
 
-u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj,
+int boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj,
                                 u16 size, void *args)
 {
         struct boardobj  *pboardobj = NULL;
@@ -61,7 +61,7 @@ u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj,
         return 0;
 }
 
-u32 boardobj_destruct_super(struct boardobj *pboardobj)
+int boardobj_destruct_super(struct boardobj *pboardobj)
 {
         struct gk20a *g = pboardobj->g;
 
@@ -86,7 +86,7 @@ bool boardobj_implements_super(struct gk20a *g, struct boardobj *pboardobj,
         return (0 != (pboardobj->type_mask & BIT(type)));
 }
 
-u32 boardobj_pmudatainit_super(struct gk20a *g, struct boardobj *pboardobj,
+int boardobj_pmudatainit_super(struct gk20a *g, struct boardobj *pboardobj,
                                 struct nv_pmu_boardobj *pmudata)
 {
         nvgpu_log_info(g, " ");
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/boardobj/boardobj.h
index 8fc8d1cc..4df14aaa 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobj.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobj.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+* Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
 *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -42,14 +42,14 @@ typedef bool boardobj_implements(struct gk20a *g, struct boardobj *pboardobj,
 * description structure, describing this BOARDOBJ board device to the PMU.
 *
 */
-typedef u32 boardobj_pmudatainit(struct gk20a *g, struct boardobj *pboardobj,
+typedef int boardobj_pmudatainit(struct gk20a *g, struct boardobj *pboardobj,
                                 struct nv_pmu_boardobj *pmudata);
 
 /*
 * Constructor for the base Board Object. Called by each device-specific
 * implementation of the BOARDOBJ interface to initialize the board object.
 */
-typedef u32 boardobj_construct(struct gk20a *g, struct boardobj **pboardobj,
+typedef int boardobj_construct(struct gk20a *g, struct boardobj **pboardobj,
                                 u16 size, void *args);
 
 /*
@@ -58,7 +58,7 @@ typedef u32 boardobj_construct(struct gk20a *g, struct boardobj **pboardobj,
 * This has to be explicitly set by each device that extends from the
 * board object.
 */
-typedef u32 boardobj_destruct(struct boardobj *pboardobj);
+typedef int boardobj_destruct(struct boardobj *pboardobj);
 
 /*
 * Base Class for all physical or logical device on the PCB.
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
index e0ab67be..e3b69d4b 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
@@ -32,10 +32,10 @@ static boardobjgrp_objgetnext   boardobjgrp_objgetnext_final;
 static boardobjgrp_objremoveanddestroy  boardobjgrp_objremoveanddestroy_final;
 static boardobjgrp_pmudatainstget boardobjgrp_pmudatainstget_stub;
 static boardobjgrp_pmustatusinstget boardobjgrp_pmustatusinstget_stub;
-static u32 boardobjgrp_pmucmdsend(struct gk20a *g,
+static int boardobjgrp_pmucmdsend(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp,
                 struct boardobjgrp_pmu_cmd *pcmd);
-static u32 boardobjgrp_pmucmdsend_rpc(struct gk20a *g,
+static int boardobjgrp_pmucmdsend_rpc(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp,
                 struct boardobjgrp_pmu_cmd *pcmd,
                 bool copy_out);
@@ -48,7 +48,8 @@ struct boardobjgrp_pmucmdhandler_params {
         u32 success;
 };
 
-u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp)
+int boardobjgrp_construct_super(struct gk20a *g,
+        struct boardobjgrp *pboardobjgrp)
 {
         nvgpu_log_info(g, " ");
 
@@ -102,7 +103,7 @@ u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgr
         return 0;
 }
 
-u32 boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp)
+int boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp)
 {
         struct gk20a *g = pboardobjgrp->g;
 
@@ -119,12 +120,12 @@ u32 boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp)
         return pboardobjgrp->destruct(pboardobjgrp);
 }
 
-u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp)
+int boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp)
 {
         struct boardobj *pboardobj;
         struct gk20a *g = pboardobjgrp->g;
-        u32 status = 0;
-        u32 stat;
+        int status = 0;
+        int stat;
         u8  index;
 
         nvgpu_log_info(g, " ");
@@ -174,7 +175,7 @@ u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp)
         return status;
 }
 
-u32 boardobjgrp_pmucmd_construct_impl(struct gk20a *g, struct boardobjgrp
+int boardobjgrp_pmucmd_construct_impl(struct gk20a *g, struct boardobjgrp
         *pboardobjgrp, struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid,
         u8 hdrsize, u8 entrysize, u16 fbsize,  u32 ss_offset, u8 rpc_func_id)
 {
@@ -190,7 +191,7 @@ u32 boardobjgrp_pmucmd_construct_impl(struct gk20a *g, struct boardobjgrp
         return 0;
 }
 
-u32 boardobjgrp_pmucmd_construct_impl_v1(struct gk20a *g, struct boardobjgrp
+int boardobjgrp_pmucmd_construct_impl_v1(struct gk20a *g, struct boardobjgrp
         *pboardobjgrp, struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid,
         u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id)
 {
@@ -206,7 +207,7 @@ u32 boardobjgrp_pmucmd_construct_impl_v1(struct gk20a *g, struct boardobjgrp
         return 0;
 }
 
-u32 boardobjgrp_pmucmd_destroy_impl(struct gk20a *g,
+int boardobjgrp_pmucmd_destroy_impl(struct gk20a *g,
         struct boardobjgrp_pmu_cmd *cmd)
 {
         struct nvgpu_mem *mem = &cmd->surf.sysmem_desc;
@@ -242,11 +243,11 @@ int is_boardobjgrp_pmucmd_id_valid_v1(struct gk20a *g,
         return err;
 }
 
-u32 boardobjgrp_pmucmd_pmuinithandle_impl(struct gk20a *g,
+int boardobjgrp_pmucmd_pmuinithandle_impl(struct gk20a *g,
         struct boardobjgrp *pboardobjgrp,
         struct boardobjgrp_pmu_cmd *pcmd)
 {
-        u32 status = 0;
+        int status = 0;
         struct nvgpu_mem *sysmem_desc = &pcmd->surf.sysmem_desc;
 
         nvgpu_log_info(g, " ");
@@ -271,10 +272,10 @@ boardobjgrp_pmucmd_pmuinithandle_exit:
         return status;
 }
 
-u32 boardobjgrp_pmuinithandle_impl(struct gk20a *g,
+int boardobjgrp_pmuinithandle_impl(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp)
 {
-        u32 status = 0;
+        int status = 0;
 
         nvgpu_log_info(g, " ");
 
@@ -310,7 +311,7 @@ boardobjgrp_pmuinithandle_exit:
 }
 
 
-u32 boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp
+int boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp
         *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu,
         struct boardobjgrpmask *mask)
 {
@@ -331,7 +332,7 @@ u32 boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp
         return 0;
 }
 
-static u32 boardobjgrp_pmudatainstget_stub(struct gk20a *g,
+static int boardobjgrp_pmudatainstget_stub(struct gk20a *g,
         struct nv_pmu_boardobjgrp *boardobjgrppmu,
         struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx)
 {
@@ -340,7 +341,7 @@ static u32 boardobjgrp_pmudatainstget_stub(struct gk20a *g,
 }
 
 
-static u32 boardobjgrp_pmustatusinstget_stub(struct gk20a *g,
+static int boardobjgrp_pmustatusinstget_stub(struct gk20a *g,
         void *pboardobjgrppmu,
         struct nv_pmu_boardobj_query **ppBoardobjpmustatus, u8 idx)
 {
@@ -348,11 +349,11 @@ static u32 boardobjgrp_pmustatusinstget_stub(struct gk20a *g,
         return -EINVAL;
 }
 
-u32 boardobjgrp_pmudatainit_legacy(struct gk20a *g,
+int boardobjgrp_pmudatainit_legacy(struct gk20a *g,
         struct boardobjgrp      *pboardobjgrp,
         struct nv_pmu_boardobjgrp_super *pboardobjgrppmu)
 {
-        u32 status = 0;
+        int status = 0;
         struct boardobj *pboardobj = NULL;
         struct nv_pmu_boardobj *ppmudata = NULL;
         u8 index;
@@ -401,10 +402,10 @@ boardobjgrppmudatainit_legacy_done:
         return status;
 }
 
-u32 boardobjgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp
+int boardobjgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp
         *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu)
 {
-        u32 status = 0;
+        int status = 0;
         struct boardobj *pboardobj = NULL;
         struct nv_pmu_boardobj  *ppmudata = NULL;
         u8 index;
@@ -476,9 +477,9 @@ static int check_boardobjgrp_param(struct gk20a *g,
         return 0;
 }
 
-u32 boardobjgrp_pmuset_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp)
+int boardobjgrp_pmuset_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp)
 {
-        u32 status = 0;
+        int status = 0;
         struct boardobjgrp_pmu_cmd *pcmd =
                 (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set);
 
@@ -537,10 +538,11 @@ boardobjgrp_pmuset_exit:
         return status;
 }
 
-u32 boardobjgrp_pmuset_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjgrp)
+int boardobjgrp_pmuset_impl_v1(struct gk20a *g,
+        struct boardobjgrp *pboardobjgrp)
 {
         struct nvgpu_pmu *pmu = &g->pmu;
-        u32 status = 0;
+        int status = 0;
         struct boardobjgrp_pmu_cmd *pcmd =
                 (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set);
 
@@ -593,11 +595,11 @@ boardobjgrp_pmuset_exit:
         return status;
 }
 
-u32
+int
 boardobjgrp_pmugetstatus_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp,
         struct boardobjgrpmask *mask)
 {
-        u32 status  = 0;
+        int status  = 0;
         struct boardobjgrp_pmu_cmd *pcmd =
                 (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.getstatus);
         struct boardobjgrp_pmu_cmd *pset =
@@ -665,12 +667,12 @@ boardobjgrp_pmugetstatus_exit:
         return status;
 }
 
-u32
+int
 boardobjgrp_pmugetstatus_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjgrp,
         struct boardobjgrpmask *mask)
 {
         struct nvgpu_pmu *pmu = &g->pmu;
-        u32 status  = 0;
+        int status  = 0;
         struct boardobjgrp_pmu_cmd *pcmd =
                 (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.getstatus);
 
@@ -728,7 +730,7 @@ boardobjgrp_pmugetstatus_exit:
         return status;
 }
 
-static u32
+static int
 boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp,
         struct boardobj *pboardobj, u8 index)
 {
@@ -761,8 +763,8 @@ boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp,
         }
 
         pboardobjgrp->ppobjects[index] = pboardobj;
-        pboardobjgrp->objmaxidx = BOARDOBJGRP_IS_EMPTY(pboardobjgrp) ?
-                        index : max(pboardobjgrp->objmaxidx, index);
+        pboardobjgrp->objmaxidx = (u8)(BOARDOBJGRP_IS_EMPTY(pboardobjgrp) ?
+                        index : max(pboardobjgrp->objmaxidx, index));
         pboardobj->idx = index;
 
         pboardobjgrp->objmask |= BIT(index);
@@ -835,12 +837,12 @@ static struct boardobj *boardobjgrp_objgetnext_final(
         return pboardobjnext;
 }
 
-static u32 boardobjgrp_objremoveanddestroy_final(
+static int boardobjgrp_objremoveanddestroy_final(
                 struct boardobjgrp *pboardobjgrp,
                 u8 index)
 {
-        u32 status = 0;
-        u32 stat;
+        int status = 0;
+        int stat;
         struct gk20a *g = pboardobjgrp->g;
 
         nvgpu_log_info(g, " ");
@@ -938,7 +940,7 @@ static void boardobjgrp_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg,
         }
 }
 
-static u32 boardobjgrp_pmucmdsend(struct gk20a *g,
+static int boardobjgrp_pmucmdsend(struct gk20a *g,
                                   struct boardobjgrp *pboardobjgrp,
                                   struct boardobjgrp_pmu_cmd *pcmd)
 {
@@ -947,7 +949,7 @@ static u32 boardobjgrp_pmucmdsend(struct gk20a *g,
         struct nv_pmu_boardobj_cmd_grp *pgrpcmd;
         struct pmu_cmd cmd;
         u32 seqdesc;
-        u32 status = 0;
+        int status = 0;
 
         nvgpu_log_info(g, " ");
 
@@ -1009,7 +1011,7 @@ boardobjgrp_pmucmdsend_exit:
         return status;
 }
 
-static u32 boardobjgrp_pmucmdsend_rpc(struct gk20a *g,
+static int boardobjgrp_pmucmdsend_rpc(struct gk20a *g,
         struct boardobjgrp *pboardobjgrp,
         struct boardobjgrp_pmu_cmd *pcmd,
         bool copy_out)
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
index 8fc7136f..625e7912 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
@@ -40,13 +40,13 @@ struct pmu_surface;
 * Board Object Group destructor.
 *
 */
-typedef u32 boardobjgrp_destruct(struct boardobjgrp *pboardobjgrp);
+typedef int boardobjgrp_destruct(struct boardobjgrp *pboardobjgrp);
 
 /*
 * Inserts a previously constructed Board Object into a Board Object Group for
 * tracking. Objects are inserted in the array based on the given index.
 */
-typedef u32 boardobjgrp_objinsert(struct boardobjgrp *pboardobjgrp,
+typedef int boardobjgrp_objinsert(struct boardobjgrp *pboardobjgrp,
                 struct boardobj *pboardobj, u8 index);
 
 /*
@@ -68,7 +68,7 @@ typedef struct boardobj *boardobjgrp_objgetnext(
 * Board Object Group Remover and destructor. This is used to remove and
 * destruct specific entry from the Board Object Group.
 */
-typedef u32 boardobjgrp_objremoveanddestroy(struct boardobjgrp *pboardobjgrp,
+typedef int boardobjgrp_objremoveanddestroy(struct boardobjgrp *pboardobjgrp,
         u8 index);
 
 /*
@@ -76,14 +76,14 @@ typedef u32 boardobjgrp_objremoveanddestroy(struct boardobjgrp *pboardobjgrp,
 * for the constructed PMU CMDs, and then sets the object via the
 * PMU_BOARDOBJ_CMD_GRP interface (if constructed).
 */
-typedef u32 boardobjgrp_pmuinithandle(struct gk20a *g,
+typedef int boardobjgrp_pmuinithandle(struct gk20a *g,
                 struct boardobjgrp *pboardobjGrp);
 
 /*
 * Fills out the appropriate the PMU_BOARDOBJGRP_<xyz> driver<->PMU description
 * header structure, more specifically a mask of BOARDOBJs.
 */
-typedef u32 boardobjgrp_pmuhdrdatainit(struct gk20a *g,
+typedef int boardobjgrp_pmuhdrdatainit(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp,
                 struct nv_pmu_boardobjgrp_super *pboardobjgrppmu,
                 struct boardobjgrpmask *mask);
@@ -92,7 +92,7 @@ typedef u32 boardobjgrp_pmuhdrdatainit(struct gk20a *g,
 * Fills out the appropriate the PMU_BOARDOBJGRP_<xyz> driver->PMU description
 * structure, describing the BOARDOBJGRP and all of its BOARDOBJs to the PMU.
 */
-typedef u32 boardobjgrp_pmudatainit(struct gk20a *g,
+typedef int boardobjgrp_pmudatainit(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp,
                 struct nv_pmu_boardobjgrp_super *pboardobjgrppmu);
 
@@ -101,22 +101,22 @@ typedef u32 boardobjgrp_pmudatainit(struct gk20a *g,
 * This interface leverages @ref boardobjgrp_pmudatainit to populate the
 * structure.
 */
-typedef u32 boardobjgrp_pmuset(struct gk20a *g,
+typedef int boardobjgrp_pmuset(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp);
 
 /*
 * Gets the dynamic status of the PMU BOARDOBJGRP via the
 * PMU_BOARDOBJ_CMD_GRP GET_STATUS interface.
 */
-typedef u32 boardobjgrp_pmugetstatus(struct gk20a *g,
+typedef int boardobjgrp_pmugetstatus(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp,
                 struct boardobjgrpmask *mask);
 
-typedef u32 boardobjgrp_pmudatainstget(struct gk20a *g,
+typedef int boardobjgrp_pmudatainstget(struct gk20a *g,
         struct nv_pmu_boardobjgrp  *boardobjgrppmu,
         struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx);
 
-typedef u32 boardobjgrp_pmustatusinstget(struct gk20a *g, void *pboardobjgrppmu,
+typedef int boardobjgrp_pmustatusinstget(struct gk20a *g, void *pboardobjgrppmu,
         struct nv_pmu_boardobj_query **ppBoardobjpmustatus, u8 idx);
 
 /*
@@ -153,7 +153,7 @@ struct boardobjgrp_pmu {
 * CMD.  This provides the various information describing the PMU CMD including
 * the CMD and MSG ID and the size of the various sturctures in the payload.
 */
-typedef u32 boardobjgrp_pmucmd_construct(struct gk20a *g,
+typedef int boardobjgrp_pmucmd_construct(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp,
                 struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid,
                 u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id);
@@ -161,7 +161,7 @@ typedef u32 boardobjgrp_pmucmd_construct(struct gk20a *g,
 /*
 * Destroys BOARDOBJGRP PMU SW state.  CMD.
 */
-typedef u32 boardobjgrp_pmucmd_destroy(struct gk20a *g,
+typedef int boardobjgrp_pmucmd_destroy(struct gk20a *g,
                 struct boardobjgrp_pmu_cmd *cmd);
 
 /*
@@ -169,7 +169,7 @@ typedef u32 boardobjgrp_pmucmd_destroy(struct gk20a *g,
 * PMU CMD payload within both the PMU and driver so that it can be referenced
 * at run-time.
 */
-typedef u32 boardobjgrp_pmucmd_pmuinithandle(struct gk20a *g,
+typedef int boardobjgrp_pmucmd_pmuinithandle(struct gk20a *g,
         struct boardobjgrp *pboardobjgrp,
         struct boardobjgrp_pmu_cmd *cmd);
 
@@ -352,7 +352,8 @@ do {                                                                          \
 
 /* ------------------------ Function Prototypes ----------------------------- */
 /* Constructor and destructor */
-u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp);
+int boardobjgrp_construct_super(struct gk20a *g,
+        struct boardobjgrp *pboardobjgrp);
 boardobjgrp_destruct boardobjgrp_destruct_impl;
 boardobjgrp_destruct boardobjgrp_destruct_super;
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c
index a7da8064..b26f8ecb 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c
@@ -27,10 +27,10 @@
 #include "boardobjgrp.h"
 #include "boardobjgrpmask.h"
 
-u32 boardobjgrpconstruct_e255(struct gk20a *g,
+int boardobjgrpconstruct_e255(struct gk20a *g,
                               struct boardobjgrp_e255 *pboardobjgrp_e255)
 {
-        u32 status = 0;
+        int status = 0;
         u8  objslots;
 
         nvgpu_log_info(g, " ");
@@ -58,14 +58,14 @@ boardobjgrpconstruct_e255_exit:
         return status;
 }
 
-u32 boardobjgrp_pmuhdrdatainit_e255(struct gk20a *g,
+int boardobjgrp_pmuhdrdatainit_e255(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp,
                 struct nv_pmu_boardobjgrp_super *pboardobjgrppmu,
                 struct boardobjgrpmask *mask)
 {
         struct nv_pmu_boardobjgrp_e255 *pgrpe255 =
                 (struct nv_pmu_boardobjgrp_e255 *)pboardobjgrppmu;
-        u32 status;
+        int status;
 
         nvgpu_log_info(g, " ");
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h
index 76aa902a..10cd95c6 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,7 +43,8 @@ struct boardobjgrp_e255 {
                 boardobjgrp_pmudatainit_super(g, pboardpbjgrp, pboardobjgrppmu)
 
 /* Constructor and destructor */
-u32 boardobjgrpconstruct_e255(struct gk20a *g, struct boardobjgrp_e255 *pboardobjgrp);
+int boardobjgrpconstruct_e255(struct gk20a *g,
+        struct boardobjgrp_e255 *pboardobjgrp);
 boardobjgrp_destruct boardobjgrpdestruct_e255;
 boardobjgrp_pmuhdrdatainit  boardobjgrp_pmuhdrdatainit_e255;
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c
index 60e5caf6..48322310 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c
@@ -28,10 +28,10 @@
 #include "boardobjgrpmask.h"
 
 
-u32  boardobjgrpconstruct_e32(struct gk20a *g,
+int  boardobjgrpconstruct_e32(struct gk20a *g,
                               struct boardobjgrp_e32 *pboardobjgrp_e32)
 {
-        u32 status;
+        int status;
         u8  objslots;
 
         nvgpu_log_info(g, " ");
@@ -58,14 +58,14 @@ boardobjgrpconstruct_e32_exit:
         return status;
 }
 
-u32 boardobjgrp_pmuhdrdatainit_e32(struct gk20a *g,
+int boardobjgrp_pmuhdrdatainit_e32(struct gk20a *g,
                 struct boardobjgrp *pboardobjgrp,
                 struct nv_pmu_boardobjgrp_super *pboardobjgrppmu,
                 struct boardobjgrpmask *mask)
 {
         struct nv_pmu_boardobjgrp_e32 *pgrpe32 =
                 (struct nv_pmu_boardobjgrp_e32 *)pboardobjgrppmu;
-        u32 status;
+        int status;
 
         nvgpu_log_info(g, " ");
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h
index 97c737a5..900901bb 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -58,7 +58,8 @@ struct boardobjgrp_e32 {
                 boardobjgrp_pmudatainit_super(g, pboardpbjgrp, pboardobjgrppmu)
 
 /* Constructor and destructor */
-u32 boardobjgrpconstruct_e32(struct gk20a *g, struct boardobjgrp_e32 *pboardobjgrp);
+int boardobjgrpconstruct_e32(struct gk20a *g,
+        struct boardobjgrp_e32 *pboardobjgrp);
 boardobjgrp_destruct boardobjgrpdestruct_e32;
 boardobjgrp_pmuhdrdatainit  boardobjgrp_pmuhdrdatainit_e32;
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c
index c3f4f4a5..d957467b 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c
@@ -221,7 +221,7 @@ u8 boardobjgrpmask_bitidxhighest(struct boardobjgrpmask *mask)
         return result;
 }
 
-u32 boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx)
+int boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx)
 {
         u8 index;
         u8 offset;
@@ -241,7 +241,7 @@ u32 boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx)
         return 0;
 }
 
-u32 boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx)
+int boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx)
 {
         u8 index;
         u8 offset;
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h
index aacabfe9..c081284a 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -83,8 +83,8 @@ u8 boardobjgrpmask_bitidxlowest(struct boardobjgrpmask *mask);
 u8 boardobjgrpmask_bitidxhighest(struct boardobjgrpmask *mask);
 
 /* Operations on a single bit of a single mask */
-u32 boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx);
-u32 boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx);
+int boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx);
+int boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx);
 u32 boardobjgrpmask_bitinv(struct boardobjgrpmask *mask, u8 bitidx);
 bool boardobjgrpmask_bitget(struct boardobjgrpmask *mask, u8 bitidx);