From 361eca66b58051d46daad1b600eef1f72b7f15c0 Mon Sep 17 00:00:00 2001 From: Srirangan Date: Tue, 28 Aug 2018 11:09:19 +0530 Subject: gpu: nvgpu: boardobj: Fix MISRA 15.6 violations MISRA Rule-15.6 requires that all if-else blocks be enclosed in braces, including single statement blocks. Fix errors due to single statement if blocks without braces, introducing the braces. JIRA NVGPU-671 Change-Id: I604d85367cd4b99c39df2b9fa2d7a7219ef941d5 Signed-off-by: Srirangan Reviewed-on: https://git-master.nvidia.com/r/1807153 Reviewed-by: svc-misra-checker Reviewed-by: Konsta Holtta GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/boardobj/boardobj.c | 18 ++- drivers/gpu/nvgpu/boardobj/boardobjgrp.c | 156 +++++++++++++++++--------- drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | 12 +- drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | 12 +- drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c | 105 +++++++++++------ 5 files changed, 202 insertions(+), 101 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c index f38c7c4a..5f726935 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.c +++ b/drivers/gpu/nvgpu/boardobj/boardobj.c @@ -34,13 +34,15 @@ u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, nvgpu_log_info(g, " "); - if (devtmp == NULL) + if (devtmp == NULL) { return -EINVAL; + } if (*ppboardobj == NULL) { *ppboardobj = nvgpu_kzalloc(g, size); - if (*ppboardobj == NULL) + if (*ppboardobj == NULL) { return -ENOMEM; + } (*ppboardobj)->allocated = true; } @@ -64,12 +66,14 @@ u32 boardobj_destruct_super(struct boardobj *pboardobj) struct gk20a *g = pboardobj->g; nvgpu_log_info(g, " "); - if (pboardobj == NULL) + if (pboardobj == NULL) { return -EINVAL; + } nvgpu_list_del(&pboardobj->node); - if (pboardobj->allocated) + if (pboardobj->allocated) { nvgpu_kfree(pboardobj->g, pboardobj); + } return 0; } @@ -86,10 +90,12 @@ u32 boardobj_pmudatainit_super(struct gk20a *g, struct boardobj *pboardobj, struct nv_pmu_boardobj *pmudata) { nvgpu_log_info(g, " "); - if (pboardobj == NULL) + if (pboardobj == NULL) { return -EINVAL; - if (pmudata == NULL) + } + if (pmudata == NULL) { return -EINVAL; + } pmudata->type = pboardobj->type; nvgpu_log_info(g, " Done"); return 0; diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c index 7343f66c..e0ab67be 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c @@ -52,14 +52,17 @@ u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgr { nvgpu_log_info(g, " "); - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; + } - if (pboardobjgrp->ppobjects == NULL) + if (pboardobjgrp->ppobjects == NULL) { return -EINVAL; + } - if (pboardobjgrp->mask == NULL) + if (pboardobjgrp->mask == NULL) { return -EINVAL; + } pboardobjgrp->g = g; pboardobjgrp->objmask = 0; @@ -105,11 +108,13 @@ u32 boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp) nvgpu_log_info(g, " "); - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; + } - if (!pboardobjgrp->bconstructed) + if (!pboardobjgrp->bconstructed) { return 0; + } return pboardobjgrp->destruct(pboardobjgrp); } @@ -124,15 +129,18 @@ u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp) nvgpu_log_info(g, " "); - if (pboardobjgrp->mask == NULL) + if (pboardobjgrp->mask == NULL) { return -EINVAL; - if (pboardobjgrp->ppobjects == NULL) + } + if (pboardobjgrp->ppobjects == NULL) { return -EINVAL; + } BOARDOBJGRP_FOR_EACH(pboardobjgrp, struct boardobj*, pboardobj, index) { stat = pboardobjgrp->objremoveanddestroy(pboardobjgrp, index); - if (status == 0) + if (status == 0) { status = stat; + } pboardobjgrp->ppobjects[index] = NULL; pboardobjgrp->objmask &= ~BIT(index); @@ -141,20 +149,23 @@ u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp) pboardobjgrp->objmask = 0; if (pboardobjgrp->objmaxidx != CTRL_BOARDOBJ_IDX_INVALID) { - if (status == 0) + if (status == 0) { status = -EINVAL; + } WARN_ON(true); } /* Destroy the PMU CMD data */ stat = boardobjgrp_pmucmd_destroy_impl(g, &pboardobjgrp->pmu.set); - if (status == 0) + if (status == 0) { status = stat; + } stat = boardobjgrp_pmucmd_destroy_impl(g, &pboardobjgrp->pmu.getstatus); - if (status == 0) + if (status == 0) { status = stat; + } nvgpu_list_del(&pboardobjgrp->node); @@ -210,8 +221,9 @@ int is_boardobjgrp_pmucmd_id_valid_v0(struct gk20a *g, { int err = 0; - if (pcmd->id == BOARDOBJGRP_GRP_CMD_ID_INVALID) + if (pcmd->id == BOARDOBJGRP_GRP_CMD_ID_INVALID) { err = -EINVAL; + } return err; } @@ -223,8 +235,9 @@ int is_boardobjgrp_pmucmd_id_valid_v1(struct gk20a *g, int err = 0; if (pboardobjgrp->pmu.rpc_func_id == - BOARDOBJGRP_GRP_RPC_FUNC_ID_INVALID) + BOARDOBJGRP_GRP_RPC_FUNC_ID_INVALID) { err = -EINVAL; + } return err; } @@ -239,11 +252,13 @@ u32 boardobjgrp_pmucmd_pmuinithandle_impl(struct gk20a *g, nvgpu_log_info(g, " "); if (g->ops.pmu_ver.boardobj.is_boardobjgrp_pmucmd_id_valid(g, - pboardobjgrp, pcmd)) + pboardobjgrp, pcmd)) { goto boardobjgrp_pmucmd_pmuinithandle_exit; + } - if (!pcmd->fbsize) + if (!pcmd->fbsize) { goto boardobjgrp_pmucmd_pmuinithandle_exit; + } nvgpu_pmu_sysmem_surface_alloc(g, sysmem_desc, pcmd->fbsize); /* we only have got sysmem later this will get copied to vidmem @@ -280,13 +295,15 @@ u32 boardobjgrp_pmuinithandle_impl(struct gk20a *g, /* If the GRP_SET CMD has not been allocated, nothing left to do. */ if ((g->ops.pmu_ver.boardobj.is_boardobjgrp_pmucmd_id_valid(g, pboardobjgrp, &pboardobjgrp->pmu.set))|| - (BOARDOBJGRP_IS_EMPTY(pboardobjgrp))) + (BOARDOBJGRP_IS_EMPTY(pboardobjgrp))) { goto boardobjgrp_pmuinithandle_exit; + } /* Send the BOARDOBJGRP to the pmu via RM_PMU_BOARDOBJ_CMD_GRP. */ status = pboardobjgrp->pmuset(g, pboardobjgrp); - if (status) + if (status) { nvgpu_err(g, "failed to send boardobg grp to PMU"); + } boardobjgrp_pmuinithandle_exit: return status; @@ -299,10 +316,12 @@ u32 boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp { nvgpu_log_info(g, " "); - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; - if (pboardobjgrppmu == NULL) + } + if (pboardobjgrppmu == NULL) { return -EINVAL; + } pboardobjgrppmu->type = pboardobjgrp->type; pboardobjgrppmu->class_id = pboardobjgrp->classid; pboardobjgrppmu->obj_slots = BOARDOBJGRP_PMU_SLOTS_GET(pboardobjgrp); @@ -340,10 +359,12 @@ u32 boardobjgrp_pmudatainit_legacy(struct gk20a *g, nvgpu_log_info(g, " "); - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; - if (pboardobjgrppmu == NULL) + } + if (pboardobjgrppmu == NULL) { return -EINVAL; + } boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)pboardobjgrppmu, pboardobjgrp->objmask); @@ -390,10 +411,12 @@ u32 boardobjgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp nvgpu_log_info(g, " "); - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; - if (pboardobjgrppmu == NULL) + } + if (pboardobjgrppmu == NULL) { return -EINVAL; + } /* Initialize the PMU HDR data.*/ status = pboardobjgrp->pmuhdrdatainit(g, pboardobjgrp, pboardobjgrppmu, @@ -429,21 +452,26 @@ boardobjgrppmudatainit_super_done: static int check_boardobjgrp_param(struct gk20a *g, struct boardobjgrp *pboardobjgrp) { - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; + } - if (!pboardobjgrp->bconstructed) + if (!pboardobjgrp->bconstructed) { return -EINVAL; + } - if (pboardobjgrp->pmu.unitid == BOARDOBJGRP_UNIT_ID_INVALID) + if (pboardobjgrp->pmu.unitid == BOARDOBJGRP_UNIT_ID_INVALID) { return -EINVAL; + } - if (pboardobjgrp->pmu.classid == BOARDOBJGRP_GRP_CLASS_ID_INVALID) + if (pboardobjgrp->pmu.classid == BOARDOBJGRP_GRP_CLASS_ID_INVALID) { return -EINVAL; + } /* If no objects in the group, return early */ - if (BOARDOBJGRP_IS_EMPTY(pboardobjgrp)) + if (BOARDOBJGRP_IS_EMPTY(pboardobjgrp)) { return -EINVAL; + } return 0; } @@ -456,16 +484,19 @@ u32 boardobjgrp_pmuset_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp) nvgpu_log_info(g, " "); - if (check_boardobjgrp_param(g, pboardobjgrp)) + if (check_boardobjgrp_param(g, pboardobjgrp)) { return -EINVAL; + } - if (pboardobjgrp->pmu.set.id == BOARDOBJGRP_GRP_CMD_ID_INVALID) + if (pboardobjgrp->pmu.set.id == BOARDOBJGRP_GRP_CMD_ID_INVALID) { return -EINVAL; + } if ((pcmd->hdrsize == 0) || (pcmd->entrysize == 0) || - (pcmd->buf == NULL)) + (pcmd->buf == NULL)) { return -EINVAL; + } /* Initialize PMU buffer with BOARDOBJGRP data. */ memset(pcmd->buf, 0x0, pcmd->fbsize); @@ -515,13 +546,15 @@ u32 boardobjgrp_pmuset_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjgrp nvgpu_log_info(g, " "); - if (check_boardobjgrp_param(g, pboardobjgrp)) + if (check_boardobjgrp_param(g, pboardobjgrp)) { return -EINVAL; + } if ((pcmd->buf == NULL) && (pboardobjgrp->pmu.rpc_func_id == - BOARDOBJGRP_GRP_RPC_FUNC_ID_INVALID)) + BOARDOBJGRP_GRP_RPC_FUNC_ID_INVALID)) { return -EINVAL; + } /* Initialize PMU buffer with BOARDOBJGRP data. */ memset(pcmd->buf, 0x0, pcmd->fbsize); @@ -572,23 +605,27 @@ boardobjgrp_pmugetstatus_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp, nvgpu_log_info(g, " "); - if (check_boardobjgrp_param(g, pboardobjgrp)) + if (check_boardobjgrp_param(g, pboardobjgrp)) { return -EINVAL; + } - if (pset->id == BOARDOBJGRP_GRP_CMD_ID_INVALID) + if (pset->id == BOARDOBJGRP_GRP_CMD_ID_INVALID) { return -EINVAL; + } if ((pcmd->hdrsize == 0) || (pcmd->entrysize == 0) || - (pcmd->buf == NULL)) + (pcmd->buf == NULL)) { return -EINVAL; + } /* * Can only GET_STATUS if the BOARDOBJGRP has been previously SET to the * PMU */ - if (!pboardobjgrp->pmu.bset) + if (!pboardobjgrp->pmu.bset) { return -EINVAL; + } /* * alloc mem in vidmem & copy constructed pmu boardobjgrp data from @@ -639,20 +676,23 @@ boardobjgrp_pmugetstatus_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjg nvgpu_log_info(g, " "); - if (check_boardobjgrp_param(g, pboardobjgrp)) + if (check_boardobjgrp_param(g, pboardobjgrp)) { return -EINVAL; + } if ((pcmd->buf == NULL) && (pboardobjgrp->pmu.rpc_func_id == - BOARDOBJGRP_GRP_RPC_FUNC_ID_INVALID)) + BOARDOBJGRP_GRP_RPC_FUNC_ID_INVALID)) { return -EINVAL; + } /* * Can only GET_STATUS if the BOARDOBJGRP has been * previously SET to the PMU */ - if (!pboardobjgrp->pmu.bset) + if (!pboardobjgrp->pmu.bset) { return -EINVAL; + } /* * Initialize PMU buffer with the mask of @@ -696,24 +736,29 @@ boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp, nvgpu_log_info(g, " "); - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; + } - if (pboardobj == NULL) + if (pboardobj == NULL) { return -EINVAL; + } - if (index > pboardobjgrp->objslots) + if (index > pboardobjgrp->objslots) { return -EINVAL; + } - if (pboardobjgrp->ppobjects[index] != NULL) + if (pboardobjgrp->ppobjects[index] != NULL) { return -EINVAL; + } /* * Check that this BOARDOBJ has not already been added to a * BOARDOBJGRP */ - if (pboardobj->idx != CTRL_BOARDOBJ_IDX_INVALID) + if (pboardobj->idx != CTRL_BOARDOBJ_IDX_INVALID) { return -EINVAL; + } pboardobjgrp->ppobjects[index] = pboardobj; pboardobjgrp->objmaxidx = BOARDOBJGRP_IS_EMPTY(pboardobjgrp) ? @@ -730,8 +775,9 @@ boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp, static struct boardobj *boardobjgrp_objgetbyidx_final( struct boardobjgrp *pboardobjgrp, u8 index) { - if (!boardobjgrp_idxisvalid(pboardobjgrp, index)) + if (!boardobjgrp_idxisvalid(pboardobjgrp, index)) { return NULL; + } return pboardobjgrp->ppobjects[index]; } @@ -743,11 +789,13 @@ static struct boardobj *boardobjgrp_objgetnext_final( u8 objmaxidx; u8 index; - if (currentindex == NULL) + if (currentindex == NULL) { return NULL; + } - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return NULL; + } /* Search from next element unless first object was requested */ index = (*currentindex != CTRL_BOARDOBJ_IDX_INVALID) ? @@ -759,8 +807,9 @@ static struct boardobj *boardobjgrp_objgetnext_final( /* Validate provided mask */ if (mask != NULL) { - if (!(boardobjgrpmask_sizeeq(pboardobjgrp->mask, mask))) + if (!(boardobjgrpmask_sizeeq(pboardobjgrp->mask, mask))) { return NULL; + } } objmaxidx = pboardobjgrp->objmaxidx; @@ -796,11 +845,13 @@ static u32 boardobjgrp_objremoveanddestroy_final( nvgpu_log_info(g, " "); - if (!boardobjgrp_idxisvalid(pboardobjgrp, index)) + if (!boardobjgrp_idxisvalid(pboardobjgrp, index)) { return -EINVAL; + } - if (pboardobjgrp->objmaxidx == CTRL_BOARDOBJ_IDX_INVALID) + if (pboardobjgrp->objmaxidx == CTRL_BOARDOBJ_IDX_INVALID) { return -EINVAL; + } status = pboardobjgrp->ppobjects[index]->destruct( pboardobjgrp->ppobjects[index]); @@ -811,8 +862,9 @@ static u32 boardobjgrp_objremoveanddestroy_final( stat = boardobjgrpmask_bitclr(pboardobjgrp->mask, index); if (stat) { - if (status == 0) + if (status == 0) { status = stat; + } } /* objmaxidx requires update only if that very object was removed */ diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c index 1f2cd836..a7da8064 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c @@ -37,8 +37,9 @@ u32 boardobjgrpconstruct_e255(struct gk20a *g, objslots = 255; status = boardobjgrpmask_e255_init(&pboardobjgrp_e255->mask, NULL); - if (status) + if (status) { goto boardobjgrpconstruct_e255_exit; + } pboardobjgrp_e255->super.type = CTRL_BOARDOBJGRP_TYPE_E255; pboardobjgrp_e255->super.ppobjects = pboardobjgrp_e255->objects; @@ -46,8 +47,9 @@ u32 boardobjgrpconstruct_e255(struct gk20a *g, pboardobjgrp_e255->super.mask = &(pboardobjgrp_e255->mask.super); status = boardobjgrp_construct_super(g, &pboardobjgrp_e255->super); - if (status) + if (status) { goto boardobjgrpconstruct_e255_exit; + } pboardobjgrp_e255->super.pmuhdrdatainit = boardobjgrp_pmuhdrdatainit_e255; @@ -67,11 +69,13 @@ u32 boardobjgrp_pmuhdrdatainit_e255(struct gk20a *g, nvgpu_log_info(g, " "); - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; + } - if (pboardobjgrppmu == NULL) + if (pboardobjgrppmu == NULL) { return -EINVAL; + } status = boardobjgrpmask_export(mask, mask->bitcount, diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c index 6d4b4520..60e5caf6 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c @@ -38,8 +38,9 @@ u32 boardobjgrpconstruct_e32(struct gk20a *g, objslots = 32; status = boardobjgrpmask_e32_init(&pboardobjgrp_e32->mask, NULL); - if (status) + if (status) { goto boardobjgrpconstruct_e32_exit; + } pboardobjgrp_e32->super.type = CTRL_BOARDOBJGRP_TYPE_E32; pboardobjgrp_e32->super.ppobjects = pboardobjgrp_e32->objects; @@ -47,8 +48,9 @@ u32 boardobjgrpconstruct_e32(struct gk20a *g, pboardobjgrp_e32->super.mask = &(pboardobjgrp_e32->mask.super); status = boardobjgrp_construct_super(g, &pboardobjgrp_e32->super); - if (status) + if (status) { goto boardobjgrpconstruct_e32_exit; + } pboardobjgrp_e32->super.pmuhdrdatainit = boardobjgrp_pmuhdrdatainit_e32; @@ -67,11 +69,13 @@ u32 boardobjgrp_pmuhdrdatainit_e32(struct gk20a *g, nvgpu_log_info(g, " "); - if (pboardobjgrp == NULL) + if (pboardobjgrp == NULL) { return -EINVAL; + } - if (pboardobjgrppmu == NULL) + if (pboardobjgrppmu == NULL) { return -EINVAL; + } status = boardobjgrpmask_export(mask, mask->bitcount, &pgrpe32->obj_mask.super); diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c index 849abe16..c3f4f4a5 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c @@ -32,11 +32,13 @@ u32 boardobjgrpmask_init(struct boardobjgrpmask *mask, u8 bitsize, struct ctrl_boardobjgrp_mask *extmask) { - if (mask == NULL) + if (mask == NULL) { return -EINVAL; + } if ((bitsize != CTRL_BOARDOBJGRP_E32_MAX_OBJECTS) && - (bitsize != CTRL_BOARDOBJGRP_E255_MAX_OBJECTS)) + (bitsize != CTRL_BOARDOBJGRP_E255_MAX_OBJECTS)) { return -EINVAL; + } mask->bitcount = bitsize; mask->maskdatacount = CTRL_BOARDOBJGRP_MASK_DATA_SIZE(bitsize); @@ -56,12 +58,15 @@ u32 boardobjgrpmask_import(struct boardobjgrpmask *mask, u8 bitsize, { u8 index; - if (mask == NULL) + if (mask == NULL) { return -EINVAL; - if (extmask == NULL) + } + if (extmask == NULL) { return -EINVAL; - if (mask->bitcount != bitsize) + } + if (mask->bitcount != bitsize) { return -EINVAL; + } for (index = 0; index < mask->maskdatacount; index++) { mask->data[index] = extmask->data[index]; @@ -77,12 +82,15 @@ u32 boardobjgrpmask_export(struct boardobjgrpmask *mask, u8 bitsize, { u8 index; - if (mask == NULL) + if (mask == NULL) { return -EINVAL; - if (extmask == NULL) + } + if (extmask == NULL) { return -EINVAL; - if (mask->bitcount != bitsize) + } + if (mask->bitcount != bitsize) { return -EINVAL; + } for (index = 0; index < mask->maskdatacount; index++) { extmask->data[index] = mask->data[index]; @@ -95,8 +103,9 @@ u32 boardobjgrpmask_clr(struct boardobjgrpmask *mask) { u8 index; - if (mask == NULL) + if (mask == NULL) { return -EINVAL; + } for (index = 0; index < mask->maskdatacount; index++) { mask->data[index] = 0; } @@ -108,8 +117,9 @@ u32 boardobjgrpmask_set(struct boardobjgrpmask *mask) { u8 index; - if (mask == NULL) + if (mask == NULL) { return -EINVAL; + } for (index = 0; index < mask->maskdatacount; index++) { mask->data[index] = 0xFFFFFFFF; } @@ -121,8 +131,9 @@ u32 boardobjgrpmask_inv(struct boardobjgrpmask *mask) { u8 index; - if (mask == NULL) + if (mask == NULL) { return -EINVAL; + } for (index = 0; index < mask->maskdatacount; index++) { mask->data[index] = ~mask->data[index]; } @@ -134,11 +145,13 @@ bool boardobjgrpmask_iszero(struct boardobjgrpmask *mask) { u8 index; - if (mask == NULL) + if (mask == NULL) { return true; + } for (index = 0; index < mask->maskdatacount; index++) { - if (mask->data[index] != 0) + if (mask->data[index] != 0) { return false; + } } return true; } @@ -148,8 +161,9 @@ u8 boardobjgrpmask_bitsetcount(struct boardobjgrpmask *mask) u8 index; u8 result = 0; - if (mask == NULL) + if (mask == NULL) { return result; + } for (index = 0; index < mask->maskdatacount; index++) { u32 m = mask->data[index]; @@ -166,8 +180,9 @@ u8 boardobjgrpmask_bitidxlowest(struct boardobjgrpmask *mask) u8 index; u8 result = CTRL_BOARDOBJ_IDX_INVALID; - if (mask == NULL) + if (mask == NULL) { return result; + } for (index = 0; index < mask->maskdatacount; index++) { u32 m = mask->data[index]; @@ -188,8 +203,9 @@ u8 boardobjgrpmask_bitidxhighest(struct boardobjgrpmask *mask) u8 index; u8 result = CTRL_BOARDOBJ_IDX_INVALID; - if (mask == NULL) + if (mask == NULL) { return result; + } for (index = 0; index < mask->maskdatacount; index++) { u32 m = mask->data[index]; @@ -210,10 +226,12 @@ u32 boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx) u8 index; u8 offset; - if (mask == NULL) + if (mask == NULL) { return -EINVAL; - if (bitidx >= mask->bitcount) + } + if (bitidx >= mask->bitcount) { return -EINVAL; + } index = CTRL_BOARDOBJGRP_MASK_MASK_ELEMENT_INDEX(bitidx); offset = CTRL_BOARDOBJGRP_MASK_MASK_ELEMENT_OFFSET(bitidx); @@ -228,10 +246,12 @@ u32 boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx) u8 index; u8 offset; - if (mask == NULL) + if (mask == NULL) { return -EINVAL; - if (bitidx >= mask->bitcount) + } + if (bitidx >= mask->bitcount) { return -EINVAL; + } index = CTRL_BOARDOBJGRP_MASK_MASK_ELEMENT_INDEX(bitidx); offset = CTRL_BOARDOBJGRP_MASK_MASK_ELEMENT_OFFSET(bitidx); @@ -246,10 +266,12 @@ u32 boardobjgrpmask_bitinv(struct boardobjgrpmask *mask, u8 bitidx) u8 index; u8 offset; - if (mask == NULL) + if (mask == NULL) { return -EINVAL; - if (bitidx >= mask->bitcount) + } + if (bitidx >= mask->bitcount) { return -EINVAL; + } index = CTRL_BOARDOBJGRP_MASK_MASK_ELEMENT_INDEX(bitidx); offset = CTRL_BOARDOBJGRP_MASK_MASK_ELEMENT_OFFSET(bitidx); @@ -264,10 +286,12 @@ bool boardobjgrpmask_bitget(struct boardobjgrpmask *mask, u8 bitidx) u8 index; u8 offset; - if (mask == NULL) + if (mask == NULL) { return false; - if (bitidx >= mask->bitcount) + } + if (bitidx >= mask->bitcount) { return false; + } index = CTRL_BOARDOBJGRP_MASK_MASK_ELEMENT_INDEX(bitidx); offset = CTRL_BOARDOBJGRP_MASK_MASK_ELEMENT_OFFSET(bitidx); @@ -281,10 +305,12 @@ u32 boardobjgrpmask_and(struct boardobjgrpmask *dst, { u8 index; - if (!boardobjgrpmask_sizeeq(dst, op1)) + if (!boardobjgrpmask_sizeeq(dst, op1)) { return -EINVAL; - if (!boardobjgrpmask_sizeeq(dst, op2)) + } + if (!boardobjgrpmask_sizeeq(dst, op2)) { return -EINVAL; + } for (index = 0; index < dst->maskdatacount; index++) { dst->data[index] = op1->data[index] & op2->data[index]; @@ -299,10 +325,12 @@ u32 boardobjgrpmask_or(struct boardobjgrpmask *dst, { u8 index; - if (!boardobjgrpmask_sizeeq(dst, op1)) + if (!boardobjgrpmask_sizeeq(dst, op1)) { return -EINVAL; - if (!boardobjgrpmask_sizeeq(dst, op2)) + } + if (!boardobjgrpmask_sizeeq(dst, op2)) { return -EINVAL; + } for (index = 0; index < dst->maskdatacount; index++) { dst->data[index] = op1->data[index] | op2->data[index]; @@ -317,10 +345,12 @@ u32 boardobjgrpmask_xor(struct boardobjgrpmask *dst, { u8 index; - if (!boardobjgrpmask_sizeeq(dst, op1)) + if (!boardobjgrpmask_sizeeq(dst, op1)) { return -EINVAL; - if (!boardobjgrpmask_sizeeq(dst, op2)) + } + if (!boardobjgrpmask_sizeeq(dst, op2)) { return -EINVAL; + } for (index = 0; index < dst->maskdatacount; index++) { dst->data[index] = op1->data[index] ^ op2->data[index]; @@ -334,8 +364,9 @@ u32 boardobjgrpmask_copy(struct boardobjgrpmask *dst, { u8 index; - if (!boardobjgrpmask_sizeeq(dst, src)) + if (!boardobjgrpmask_sizeeq(dst, src)) { return -EINVAL; + } for (index = 0; index < dst->maskdatacount; index++) { dst->data[index] = src->data[index]; @@ -347,10 +378,12 @@ u32 boardobjgrpmask_copy(struct boardobjgrpmask *dst, bool boardobjgrpmask_sizeeq(struct boardobjgrpmask *op1, struct boardobjgrpmask *op2) { - if (op1 == NULL) + if (op1 == NULL) { return false; - if (op2 == NULL) + } + if (op2 == NULL) { return false; + } return op1->bitcount == op2->bitcount; } @@ -360,15 +393,17 @@ bool boardobjgrpmask_issubset(struct boardobjgrpmask *op1, { u8 index; - if (!boardobjgrpmask_sizeeq(op2, op1)) + if (!boardobjgrpmask_sizeeq(op2, op1)) { return false; + } for (index = 0; index < op1->maskdatacount; index++) { u32 op_1 = op1->data[index]; u32 op_2 = op2->data[index]; - if ((op_1 & op_2) != op_1) + if ((op_1 & op_2) != op_1) { return false; + } } return true; -- cgit v1.2.2