iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB/qib: Cleanup qib_set_part_key() with direct returns

Browse Source 
Perhaps the function is better written without
the empty bail: label and without setting ret
and just using return.

Combining the int/bool conversion of any and the
direct returns makes the resulting code clearer.

Tested-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Joe Perches 2017-11-14 16:29:41 -05:00 committed by Jason Gunthorpe
parent 3365776ebf
commit e3649293b9
1 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/infiniband/hw/qib/qib_file_ops.c
View File

@ -568,20 +568,16 @@ done:
static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key) static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key)
{ {
struct qib_pportdata *ppd = rcd->ppd; struct qib_pportdata *ppd = rcd->ppd;
int i, any = 0, pidx = -1; int i, pidx = -1;
bool any = false;
u16 lkey = key & 0x7FFF; u16 lkey = key & 0x7FFF;
int ret;
if (lkey == (QIB_DEFAULT_P_KEY & 0x7FFF)) { if (lkey == (QIB_DEFAULT_P_KEY & 0x7FFF))
/* nothing to do; this key always valid */ /* nothing to do; this key always valid */
ret = 0; return 0;
goto bail;
}
if (!lkey) { if (!lkey)
ret = -EINVAL; return -EINVAL;
goto bail;
}
/* /*
* Set the full membership bit, because it has to be * Set the full membership bit, because it has to be
@ -594,18 +590,14 @@ static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key)
for (i = 0; i < ARRAY_SIZE(rcd->pkeys); i++) { for (i = 0; i < ARRAY_SIZE(rcd->pkeys); i++) {
if (!rcd->pkeys[i] && pidx == -1) if (!rcd->pkeys[i] && pidx == -1)
pidx = i; pidx = i;
if (rcd->pkeys[i] == key) { if (rcd->pkeys[i] == key)
ret = -EEXIST; return -EEXIST;
goto bail;
}
} }
if (pidx == -1) { if (pidx == -1)
ret = -EBUSY; return -EBUSY;
goto bail; for (i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) {
}
for (any = i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) {
if (!ppd->pkeys[i]) { if (!ppd->pkeys[i]) {
any++; any = true;
continue; continue;
} }
if (ppd->pkeys[i] == key) { if (ppd->pkeys[i] == key) {
@ -613,44 +605,34 @@ static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key)
if (atomic_inc_return(pkrefs) > 1) { if (atomic_inc_return(pkrefs) > 1) {
rcd->pkeys[pidx] = key; rcd->pkeys[pidx] = key;
ret = 0; return 0;
goto bail;
} else {
/*
* lost race, decrement count, catch below
*/
atomic_dec(pkrefs);
any++;
} }
/*
* lost race, decrement count, catch below
*/
atomic_dec(pkrefs);
any = true;
} }
if ((ppd->pkeys[i] & 0x7FFF) == lkey) { if ((ppd->pkeys[i] & 0x7FFF) == lkey)
/* /*
* It makes no sense to have both the limited and * It makes no sense to have both the limited and
* full membership PKEY set at the same time since * full membership PKEY set at the same time since
* the unlimited one will disable the limited one. * the unlimited one will disable the limited one.
*/ */
ret = -EEXIST; return -EEXIST;
goto bail;
}
}
if (!any) {
ret = -EBUSY;
goto bail;
} }
if (!any)
return -EBUSY;
for (i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { for (i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) {
if (!ppd->pkeys[i] && if (!ppd->pkeys[i] &&
atomic_inc_return(&ppd->pkeyrefs[i]) == 1) { atomic_inc_return(&ppd->pkeyrefs[i]) == 1) {
rcd->pkeys[pidx] = key; rcd->pkeys[pidx] = key;
ppd->pkeys[i] = key; ppd->pkeys[i] = key;
(void) ppd->dd->f_set_ib_cfg(ppd, QIB_IB_CFG_PKEYS, 0); (void) ppd->dd->f_set_ib_cfg(ppd, QIB_IB_CFG_PKEYS, 0);
ret = 0; return 0;
goto bail;
} }
} }
ret = -EBUSY; return -EBUSY;
bail:
return ret;
} }
/** /**