| Message ID | 1508484951.6806.46.camel@perches.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, 2017-10-20 at 00:35 -0700, Joe Perches wrote: > On Fri, 2017-10-20 at 09:21 +0200, Colin King wrote: > > From: Colin Ian King <colin.king@canonical.com> > > > > The variable all is being set but is never read after this > > hence it can be removed from the for loop initialization. > > Cleans up clang warning: > > any is really used as bool and is initialized at function > entry. The earlier loop also reinitializes any unnecessarily. Denny, can you weigh in on what you want in this thread? Thanks. > > drivers/infiniband/hw/qib/qib_file_ops.c:640:7: warning: Value > > stored to 'any' is never read > > > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > --- > > drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c > > index 2d6a191afec0..b5c2e4223ee7 100644 > > --- a/drivers/infiniband/hw/qib/qib_file_ops.c > > +++ b/drivers/infiniband/hw/qib/qib_file_ops.c > > @@ -637,7 +637,7 @@ static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key) > > ret = -EBUSY; > > goto bail; > > } > > - for (any = i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { > > + for (i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { > > if (!ppd->pkeys[i] && > > atomic_inc_return(&ppd->pkeyrefs[i]) == 1) { > > rcd->pkeys[pidx] = key; > > 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 seems clearer to me. > > Something like: > --- > drivers/infiniband/hw/qib/qib_file_ops.c | 70 ++++++++++++-------------------- > 1 file changed, 27 insertions(+), 43 deletions(-) > > diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c > index 2d6a191afec0..8078854e1cd6 100644 > --- a/drivers/infiniband/hw/qib/qib_file_ops.c > +++ b/drivers/infiniband/hw/qib/qib_file_ops.c > @@ -568,20 +568,17 @@ static int qib_tid_free(struct qib_ctxtdata *rcd, unsigned subctxt, > static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key) > { > struct qib_pportdata *ppd = rcd->ppd; > - int i, any = 0, pidx = -1; > + int i; > + bool any = false; > + int pidx = -1; > u16 lkey = key & 0x7FFF; > - int ret; > > - if (lkey == (QIB_DEFAULT_P_KEY & 0x7FFF)) { > - /* nothing to do; this key always valid */ > - ret = 0; > - goto bail; > - } > + /* nothing to do; this key always valid */ > + if (lkey == (QIB_DEFAULT_P_KEY & 0x7FFF)) > + return 0; > > - if (!lkey) { > - ret = -EINVAL; > - goto bail; > - } > + if (!lkey) > + return -EINVAL; > > /* > * Set the full membership bit, because it has to be > @@ -594,18 +591,15 @@ static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key) > for (i = 0; i < ARRAY_SIZE(rcd->pkeys); i++) { > if (!rcd->pkeys[i] && pidx == -1) > pidx = i; > - if (rcd->pkeys[i] == key) { > - ret = -EEXIST; > - goto bail; > - } > - } > - if (pidx == -1) { > - ret = -EBUSY; > - goto bail; > + if (rcd->pkeys[i] == key) > + return -EEXIST; > } > - for (any = i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { > + if (pidx == -1) > + return -EBUSY; > + > + for (i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { > if (!ppd->pkeys[i]) { > - any++; > + any = true; > continue; > } > if (ppd->pkeys[i] == key) { > @@ -613,44 +607,34 @@ static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key) > > if (atomic_inc_return(pkrefs) > 1) { > rcd->pkeys[pidx] = key; > - ret = 0; > - goto bail; > - } else { > - /* > - * lost race, decrement count, catch below > - */ > - atomic_dec(pkrefs); > - any++; > + return 0; > } > + /* 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 > * full membership PKEY set at the same time since > * the unlimited one will disable the limited one. > */ > - ret = -EEXIST; > - goto bail; > - } > - } > - if (!any) { > - ret = -EBUSY; > - goto bail; > + return -EEXIST; > } > - for (any = i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { > + if (!any) > + return -EBUSY; > + > + for (i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { > if (!ppd->pkeys[i] && > atomic_inc_return(&ppd->pkeyrefs[i]) == 1) { > rcd->pkeys[pidx] = key; > ppd->pkeys[i] = key; > (void) ppd->dd->f_set_ib_cfg(ppd, QIB_IB_CFG_PKEYS, 0); > - ret = 0; > - goto bail; > + return 0; > } > } > - ret = -EBUSY; > > -bail: > - return ret; > + return -EBUSY; > } > > /**
PiA+IE9uIEZyaSwgMjAxNy0xMC0yMCBhdCAwOToyMSArMDIwMCwgQ29saW4gS2luZyB3cm90ZToN Cj4gPiA+IEZyb206IENvbGluIElhbiBLaW5nIDxjb2xpbi5raW5nQGNhbm9uaWNhbC5jb20+DQo+ ID4gPg0KPiA+ID4gVGhlIHZhcmlhYmxlIGFsbCBpcyBiZWluZyBzZXQgYnV0IGlzIG5ldmVyIHJl YWQgYWZ0ZXIgdGhpcw0KPiA+ID4gaGVuY2UgaXQgY2FuIGJlIHJlbW92ZWQgZnJvbSB0aGUgZm9y IGxvb3AgaW5pdGlhbGl6YXRpb24uDQo+ID4gPiBDbGVhbnMgdXAgY2xhbmcgd2FybmluZzoNCj4g Pg0KPiA+IGFueSBpcyByZWFsbHkgdXNlZCBhcyBib29sIGFuZCBpcyBpbml0aWFsaXplZCBhdCBm dW5jdGlvbg0KPiA+IGVudHJ5LiAgVGhlIGVhcmxpZXIgbG9vcCBhbHNvIHJlaW5pdGlhbGl6ZXMg YW55IHVubmVjZXNzYXJpbHkuDQo+IA0KPiBEZW5ueSwgY2FuIHlvdSB3ZWlnaCBpbiBvbiB3aGF0 IHlvdSB3YW50IGluIHRoaXMgdGhyZWFkPyAgVGhhbmtzLg0KPiANCg0KSSBhbSBvayB3aXRoIGJv dGggQ29saW4ncyBhbmQgSm9lJ3MgcGF0Y2guDQoNCkpvZSdzIHBhdGNoIHdvdWxkIHJlcXVpcmUg YWRkaXRpb25hbCB0ZXN0aW5nIHZzLiB0aGUgdHJpdmlhbCB3YXJuaW5nIGZpeC4NCg0KVGhlbiB0 aGVyZSBpcyBhICJndWlkZWxpbmUiICB0byBrZWVwIGZpeGVzIHNlcGFyYXRlIGZyb20gY2xlYW4g dXAuLi4NCg0KRG91ZywgIGRvIHlvdSB3YW50IGEgdGVzdGVkIHBhdGNoIGZyb20gbWU/DQoNCk1p a2UNCg0K -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2017-11-10 at 19:07 +0000, Marciniszyn, Mike wrote: > > > On Fri, 2017-10-20 at 09:21 +0200, Colin King wrote: > > > > From: Colin Ian King <colin.king@canonical.com> > > > > > > > > The variable all is being set but is never read after this > > > > hence it can be removed from the for loop initialization. > > > > Cleans up clang warning: > > > > > > any is really used as bool and is initialized at function > > > entry. The earlier loop also reinitializes any unnecessarily. > > > > Denny, can you weigh in on what you want in this thread? Thanks. > > > > I am ok with both Colin's and Joe's patch. > > Joe's patch would require additional testing vs. the trivial warning fix. > > Then there is a "guideline" to keep fixes separate from clean up... > > Doug, do you want a tested patch from me? Preferably, yes :-)
PiA+IERvdWcsICBkbyB5b3Ugd2FudCBhIHRlc3RlZCBwYXRjaCBmcm9tIG1lPw0KPiANCj4gUHJl ZmVyYWJseSwgeWVzIDotKQ0KPiANCg0KVGhlc2UgcGF0Y2hlcyBhcmUgaW4gYSB0d28gcGF0Y2gg c2VyaWVzOg0KaHR0cHM6Ly9tYXJjLmluZm8vP2w9bGludXgtcmRtYSZtPTE1MTA2OTQ5NzUwNjky MyZ3PTINCg0KVGhlIGZpcnN0IGlzIENvbGluJ3Mgd2FybmluZyBmaXggYW5kIHRoZSBzZWNvbmQg aXMgSm9lJ3MgY2xlYW51cC4NCg0KTXkgdmFsdWUgYWRkIGlzIHRoZSB0ZXN0aW5nLiAgOikNCg0K VGhleSBwYXNzIG91ciBwc20gdGVzdGluZy4NCg0KVGhhbmtzIGZvciB0aGUgcGF0Y2hlcyENCg0K TWlrZQ0K -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c index 2d6a191afec0..8078854e1cd6 100644 --- a/drivers/infiniband/hw/qib/qib_file_ops.c +++ b/drivers/infiniband/hw/qib/qib_file_ops.c @@ -568,20 +568,17 @@ static int qib_tid_free(struct qib_ctxtdata *rcd, unsigned subctxt, static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key) { struct qib_pportdata *ppd = rcd->ppd; - int i, any = 0, pidx = -1; + int i; + bool any = false; + int pidx = -1; u16 lkey = key & 0x7FFF; - int ret; - if (lkey == (QIB_DEFAULT_P_KEY & 0x7FFF)) { - /* nothing to do; this key always valid */ - ret = 0; - goto bail; - } + /* nothing to do; this key always valid */ + if (lkey == (QIB_DEFAULT_P_KEY & 0x7FFF)) + return 0; - if (!lkey) { - ret = -EINVAL; - goto bail; - } + if (!lkey) + return -EINVAL; /* * Set the full membership bit, because it has to be @@ -594,18 +591,15 @@ static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key) for (i = 0; i < ARRAY_SIZE(rcd->pkeys); i++) { if (!rcd->pkeys[i] && pidx == -1) pidx = i; - if (rcd->pkeys[i] == key) { - ret = -EEXIST; - goto bail; - } - } - if (pidx == -1) { - ret = -EBUSY; - goto bail; + if (rcd->pkeys[i] == key) + return -EEXIST; } - for (any = i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { + if (pidx == -1) + return -EBUSY; + + for (i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { if (!ppd->pkeys[i]) { - any++; + any = true; continue; } if (ppd->pkeys[i] == key) { @@ -613,44 +607,34 @@ static int qib_set_part_key(struct qib_ctxtdata *rcd, u16 key) if (atomic_inc_return(pkrefs) > 1) { rcd->pkeys[pidx] = key; - ret = 0; - goto bail; - } else { - /* - * lost race, decrement count, catch below - */ - atomic_dec(pkrefs); - any++; + return 0; } + /* 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 * full membership PKEY set at the same time since * the unlimited one will disable the limited one. */ - ret = -EEXIST; - goto bail; - } - } - if (!any) { - ret = -EBUSY; - goto bail; + return -EEXIST; } - for (any = i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { + if (!any) + return -EBUSY; + + for (i = 0; i < ARRAY_SIZE(ppd->pkeys); i++) { if (!ppd->pkeys[i] && atomic_inc_return(&ppd->pkeyrefs[i]) == 1) { rcd->pkeys[pidx] = key; ppd->pkeys[i] = key; (void) ppd->dd->f_set_ib_cfg(ppd, QIB_IB_CFG_PKEYS, 0); - ret = 0; - goto bail; + return 0; } } - ret = -EBUSY; -bail: - return ret; + return -EBUSY; } /**