| Message ID | 20171006213333.6721-41-bart.vanassche@wdc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
> Subject: [PATCH 40/47] IB/qib: Make qib_inc_eeprom_err() macro more safe > to use > > Avoid that using the qib_inc_eeprom_err() macro in an if-statement > triggers the following compiler warning: > > warning: suggest braces around empty body in an 'if' statement [-Wempty- > body] > There needs to be a follow-on patch here to get rid of the uses of this macro. The original fix got rid of a bad implementation, but should have totally removed both the function and its use. The is not the fault of this patch. Fixes: 18c0b82a3e45 (" IB/qib: Do not write EEPROM") Acked-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Mike -- 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 Tue, 2017-10-10 at 14:15 +0000, Marciniszyn, Mike wrote: > > Subject: [PATCH 40/47] IB/qib: Make qib_inc_eeprom_err() macro more safe > > to use > > > > Avoid that using the qib_inc_eeprom_err() macro in an if-statement > > triggers the following compiler warning: > > > > warning: suggest braces around empty body in an 'if' statement [-Wempty- > > body] > > > > There needs to be a follow-on patch here to get rid of the uses of this macro. > > The original fix got rid of a bad implementation, but should have totally > removed both the function and its use. > > The is not the fault of this patch. > > Fixes: 18c0b82a3e45 (" IB/qib: Do not write EEPROM") > Acked-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Hello Mike, How about dropping this patch and replacing it with a patch that removes all uses of qib_inc_eeprom_err()? Thanks, Bart.
> > Hello Mike, > > How about dropping this patch and replacing it with a patch that removes all > uses > of qib_inc_eeprom_err()? > I'm fine with that too. Mike
T24gVHVlLCAyMDE3LTEwLTEwIGF0IDE1OjM2ICswMDAwLCBNYXJjaW5pc3p5biwgTWlrZSB3cm90 ZToNCj4gQmFydCB3cm90ZToNCj4gPiBIb3cgYWJvdXQgZHJvcHBpbmcgdGhpcyBwYXRjaCBhbmQg cmVwbGFjaW5nIGl0IHdpdGggYSBwYXRjaCB0aGF0IHJlbW92ZXMgYWxsDQo+ID4gdXNlcyBvZiBx aWJfaW5jX2VlcHJvbV9lcnIoKT8NCj4gDQo+IEknbSBmaW5lIHdpdGggdGhhdCB0b28uDQoNCkhv dyBhYm91dCB0aGUgcGF0Y2ggYmVsb3c/DQoNClRoYW5rcywNCg0KQmFydC4NCg0KDQpTdWJqZWN0 OiBbUEFUQ0hdIElCL3FpYjogUmVtb3ZlIHRoZSBxaWJfaW5jX2VlcHJvbV9lcnIoKSBtYWNybw0K DQpTaW5jZSB0aGUgYm9keSBvZiB0aGUgcWliX2luY19lZXByb21fZXJyKCkgbWFjcm8gaXMgZW1w dHksIHJlbW92ZQ0KdGhlIGludm9jYXRpb25zIG9mIHRoaXMgbWFjcm8uDQoNClJlZmVyZW5jZXM6 IGNvbW1pdCAxOGMwYjgyYTNlNDUgKCIgSUIvcWliOiBEbyBub3Qgd3JpdGUgRUVQUk9NIikNClNp Z25lZC1vZmYtYnk6IEJhcnQgVmFuIEFzc2NoZSA8YmFydC52YW5hc3NjaGVAd2RjLmNvbT4NCkNj OiBNaWtlIE1hcmNpbmlzenluIDxpbmZpbmlwYXRoQGludGVsLmNvbT4NCi0tLQ0KIGRyaXZlcnMv aW5maW5pYmFuZC9ody9xaWIvcWliLmggICAgICAgICB8ICAxIC0NCiBkcml2ZXJzL2luZmluaWJh bmQvaHcvcWliL3FpYl9pYmE2MTIwLmMgfCAxMSAtLS0tLS0tLS0tLQ0KIGRyaXZlcnMvaW5maW5p YmFuZC9ody9xaWIvcWliX2liYTcyMjAuYyB8IDEwIC0tLS0tLS0tLS0NCiBkcml2ZXJzL2luZmlu aWJhbmQvaHcvcWliL3FpYl9pYmE3MzIyLmMgfCAgNiArLS0tLS0NCiA0IGZpbGVzIGNoYW5nZWQs IDEgaW5zZXJ0aW9uKCspLCAyNyBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBhL2RyaXZlcnMv aW5maW5pYmFuZC9ody9xaWIvcWliLmggYi9kcml2ZXJzL2luZmluaWJhbmQvaHcvcWliL3FpYi5o DQppbmRleCAxMTY3YTljMTc3NmIuLjE4NjlmY2UwYmEwMCAxMDA2NDQNCi0tLSBhL2RyaXZlcnMv aW5maW5pYmFuZC9ody9xaWIvcWliLmgNCisrKyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIv cWliLmgNCkBAIC0xMjk3LDcgKzEyOTcsNiBAQCBpbnQgcWliX3R3c2lfYmxrX3JkKHN0cnVjdCBx aWJfZGV2ZGF0YSAqZGQsIGludCBkZXYsIGludCBhZGRyLCB2b2lkICpidWZmZXIsDQogaW50IHFp Yl90d3NpX2Jsa193cihzdHJ1Y3QgcWliX2RldmRhdGEgKmRkLCBpbnQgZGV2LCBpbnQgYWRkciwN CiAJCSAgICBjb25zdCB2b2lkICpidWZmZXIsIGludCBsZW4pOw0KIHZvaWQgcWliX2dldF9lZXBy b21faW5mbyhzdHJ1Y3QgcWliX2RldmRhdGEgKik7DQotI2RlZmluZSBxaWJfaW5jX2VlcHJvbV9l cnIoZGQsIGVpZHgsIGluY3IpDQogdm9pZCBxaWJfZHVtcF9sb29rdXBfb3V0cHV0X3F1ZXVlKHN0 cnVjdCBxaWJfZGV2ZGF0YSAqKTsNCiB2b2lkIHFpYl9mb3JjZV9waW9fYXZhaWxfdXBkYXRlKHN0 cnVjdCBxaWJfZGV2ZGF0YSAqKTsNCiB2b2lkIHFpYl9jbGVhcl9zeW1lcnJvcl9vbl9saW5rdXAo dW5zaWduZWQgbG9uZyBvcGFxdWUpOw0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW5maW5pYmFuZC9o dy9xaWIvcWliX2liYTYxMjAuYyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIvcWliX2liYTYx MjAuYw0KaW5kZXggYzRhNGM1N2UwZjBhLi5lMGI1MmJhYjZmMzQgMTAwNjQ0DQotLS0gYS9kcml2 ZXJzL2luZmluaWJhbmQvaHcvcWliL3FpYl9pYmE2MTIwLmMNCisrKyBiL2RyaXZlcnMvaW5maW5p YmFuZC9ody9xaWIvcWliX2liYTYxMjAuYw0KQEAgLTc0OCw3ICs3NDgsNiBAQCBzdGF0aWMgdm9p ZCBxaWJfaGFuZGxlXzYxMjBfaHdlcnJvcnMoc3RydWN0IHFpYl9kZXZkYXRhICpkZCwgY2hhciAq bXNnLA0KIAl1MzIgYml0cywgY3RybDsNCiAJaW50IGlzZmF0YWwgPSAwOw0KIAljaGFyICpiaXRz bXNnOw0KLQlpbnQgbG9nX2lkeDsNCiANCiAJaHdlcnJzID0gcWliX3JlYWRfa3JlZzY0KGRkLCBr cl9od2VycnN0YXR1cyk7DQogCWlmICghaHdlcnJzKQ0KQEAgLTc3MCwxMSArNzY5LDYgQEAgc3Rh dGljIHZvaWQgcWliX2hhbmRsZV82MTIwX2h3ZXJyb3JzKHN0cnVjdCBxaWJfZGV2ZGF0YSAqZGQs IGNoYXIgKm1zZywNCiANCiAJaHdlcnJzICY9IGRkLT5jc3BlYy0+aHdlcnJtYXNrOw0KIA0KLQkv KiBXZSBsb2cgc29tZSBlcnJvcnMgdG8gRUVQUk9NLCBjaGVjayBpZiB3ZSBoYXZlIGFueSBvZiB0 aG9zZS4gKi8NCi0JZm9yIChsb2dfaWR4ID0gMDsgbG9nX2lkeCA8IFFJQl9FRVBfTE9HX0NOVDsg Kytsb2dfaWR4KQ0KLQkJaWYgKGh3ZXJycyAmIGRkLT5lZXBfc3RfbWFza3NbbG9nX2lkeF0uaHdl cnJzX3RvX2xvZykNCi0JCQlxaWJfaW5jX2VlcHJvbV9lcnIoZGQsIGxvZ19pZHgsIDEpOw0KLQ0K IAkvKg0KIAkgKiBNYWtlIHN1cmUgd2UgZ2V0IHRoaXMgbXVjaCBvdXQsIHVubGVzcyB0b2xkIHRv IGJlIHF1aWV0LA0KIAkgKiBvciBpdCdzIG9jY3VycmVkIHdpdGhpbiB0aGUgbGFzdCA1IHNlY29u ZHMuDQpAQCAtMTAwNCw3ICs5OTgsNiBAQCBzdGF0aWMgdm9pZCBoYW5kbGVfNjEyMF9lcnJvcnMo c3RydWN0IHFpYl9kZXZkYXRhICpkZCwgdTY0IGVycnMpDQogCWNoYXIgKm1zZzsNCiAJdTY0IGln bm9yZV90aGlzX3RpbWUgPSAwOw0KIAl1NjQgaXNlcnIgPSAwOw0KLQlpbnQgbG9nX2lkeDsNCiAJ c3RydWN0IHFpYl9wcG9ydGRhdGEgKnBwZCA9IGRkLT5wcG9ydDsNCiAJdTY0IG1hc2s7DQogDQpA QCAtMTAxNSwxMCArMTAwOCw2IEBAIHN0YXRpYyB2b2lkIGhhbmRsZV82MTIwX2Vycm9ycyhzdHJ1 Y3QgcWliX2RldmRhdGEgKmRkLCB1NjQgZXJycykNCiAJLyogZG8gdGhlc2UgZmlyc3QsIHRoZXkg YXJlIG1vc3QgaW1wb3J0YW50ICovDQogCWlmIChlcnJzICYgRVJSX01BU0soSGFyZHdhcmVFcnIp KQ0KIAkJcWliX2hhbmRsZV82MTIwX2h3ZXJyb3JzKGRkLCBtc2csIHNpemVvZihkZC0+Y3NwZWMt PmVtc2didWYpKTsNCi0JZWxzZQ0KLQkJZm9yIChsb2dfaWR4ID0gMDsgbG9nX2lkeCA8IFFJQl9F RVBfTE9HX0NOVDsgKytsb2dfaWR4KQ0KLQkJCWlmIChlcnJzICYgZGQtPmVlcF9zdF9tYXNrc1ts b2dfaWR4XS5lcnJzX3RvX2xvZykNCi0JCQkJcWliX2luY19lZXByb21fZXJyKGRkLCBsb2dfaWR4 LCAxKTsNCiANCiAJaWYgKGVycnMgJiB+SUJfRV9CSVRTRVhUQU5UKQ0KIAkJcWliX2Rldl9lcnIo ZGQsDQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pbmZpbmliYW5kL2h3L3FpYi9xaWJfaWJhNzIyMC5j IGIvZHJpdmVycy9pbmZpbmliYW5kL2h3L3FpYi9xaWJfaWJhNzIyMC5jDQppbmRleCA3OGNlNzli ZTQxMjAuLjc1ZjJjZmQwZDI3MiAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvaW5maW5pYmFuZC9ody9x aWIvcWliX2liYTcyMjAuYw0KKysrIGIvZHJpdmVycy9pbmZpbmliYW5kL2h3L3FpYi9xaWJfaWJh NzIyMC5jDQpAQCAtMTA5NCw3ICsxMDk0LDYgQEAgc3RhdGljIHZvaWQgaGFuZGxlXzcyMjBfZXJy b3JzKHN0cnVjdCBxaWJfZGV2ZGF0YSAqZGQsIHU2NCBlcnJzKQ0KIAljaGFyICptc2c7DQogCXU2 NCBpZ25vcmVfdGhpc190aW1lID0gMDsNCiAJdTY0IGlzZXJyID0gMDsNCi0JaW50IGxvZ19pZHg7 DQogCXN0cnVjdCBxaWJfcHBvcnRkYXRhICpwcGQgPSBkZC0+cHBvcnQ7DQogCXU2NCBtYXNrOw0K IA0KQEAgLTExMDUsMTAgKzExMDQsNiBAQCBzdGF0aWMgdm9pZCBoYW5kbGVfNzIyMF9lcnJvcnMo c3RydWN0IHFpYl9kZXZkYXRhICpkZCwgdTY0IGVycnMpDQogCS8qIGRvIHRoZXNlIGZpcnN0LCB0 aGV5IGFyZSBtb3N0IGltcG9ydGFudCAqLw0KIAlpZiAoZXJycyAmIEVSUl9NQVNLKEhhcmR3YXJl RXJyKSkNCiAJCXFpYl83MjIwX2hhbmRsZV9od2Vycm9ycyhkZCwgbXNnLCBzaXplb2YoZGQtPmNz cGVjLT5lbXNnYnVmKSk7DQotCWVsc2UNCi0JCWZvciAobG9nX2lkeCA9IDA7IGxvZ19pZHggPCBR SUJfRUVQX0xPR19DTlQ7ICsrbG9nX2lkeCkNCi0JCQlpZiAoZXJycyAmIGRkLT5lZXBfc3RfbWFz a3NbbG9nX2lkeF0uZXJyc190b19sb2cpDQotCQkJCXFpYl9pbmNfZWVwcm9tX2VycihkZCwgbG9n X2lkeCwgMSk7DQogDQogCWlmIChlcnJzICYgUUxPR0lDX0lCX0VfU0RNQUVSUlMpDQogCQlzZG1h XzcyMjBfZXJyb3JzKHBwZCwgZXJycyk7DQpAQCAtMTMwMiw3ICsxMjk3LDYgQEAgc3RhdGljIHZv aWQgcWliXzcyMjBfaGFuZGxlX2h3ZXJyb3JzKHN0cnVjdCBxaWJfZGV2ZGF0YSAqZGQsIGNoYXIg Km1zZywNCiAJdTMyIGJpdHMsIGN0cmw7DQogCWludCBpc2ZhdGFsID0gMDsNCiAJY2hhciAqYml0 c21zZzsNCi0JaW50IGxvZ19pZHg7DQogDQogCWh3ZXJycyA9IHFpYl9yZWFkX2tyZWc2NChkZCwg a3JfaHdlcnJzdGF0dXMpOw0KIAlpZiAoIWh3ZXJycykNCkBAIC0xMzI2LDEwICsxMzIwLDYgQEAg c3RhdGljIHZvaWQgcWliXzcyMjBfaGFuZGxlX2h3ZXJyb3JzKHN0cnVjdCBxaWJfZGV2ZGF0YSAq ZGQsIGNoYXIgKm1zZywNCiANCiAJaHdlcnJzICY9IGRkLT5jc3BlYy0+aHdlcnJtYXNrOw0KIA0K LQkvKiBXZSBsb2cgc29tZSBlcnJvcnMgdG8gRUVQUk9NLCBjaGVjayBpZiB3ZSBoYXZlIGFueSBv ZiB0aG9zZS4gKi8NCi0JZm9yIChsb2dfaWR4ID0gMDsgbG9nX2lkeCA8IFFJQl9FRVBfTE9HX0NO VDsgKytsb2dfaWR4KQ0KLQkJaWYgKGh3ZXJycyAmIGRkLT5lZXBfc3RfbWFza3NbbG9nX2lkeF0u aHdlcnJzX3RvX2xvZykNCi0JCQlxaWJfaW5jX2VlcHJvbV9lcnIoZGQsIGxvZ19pZHgsIDEpOw0K IAlpZiAoaHdlcnJzICYgfihUWEVNRU1QQVJJVFlFUlJfUElPQlVGIHwgVFhFTUVNUEFSSVRZRVJS X1BJT1BCQyB8DQogCQkgICAgICAgUlhFX1BBUklUWSkpDQogCQlxaWJfZGV2aW5mbyhkZC0+cGNp ZGV2LA0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIvcWliX2liYTczMjIu YyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIvcWliX2liYTczMjIuYw0KaW5kZXggNGQwMmNm ZmU0ZTAzLi43NzIxN2ZhZTljMDYgMTAwNjQ0DQotLS0gYS9kcml2ZXJzL2luZmluaWJhbmQvaHcv cWliL3FpYl9pYmE3MzIyLmMNCisrKyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIvcWliX2li YTczMjIuYw0KQEAgLTE2NDQsNyArMTY0NCw2IEBAIHN0YXRpYyBub2lubGluZSB2b2lkIGhhbmRs ZV83MzIyX2Vycm9ycyhzdHJ1Y3QgcWliX2RldmRhdGEgKmRkKQ0KIAl1NjQgaXNlcnIgPSAwOw0K IAl1NjQgZXJyczsNCiAJdTY0IG1hc2s7DQotCWludCBsb2dfaWR4Ow0KIA0KIAlxaWJfc3RhdHMu c3BzX2VycmludHMrKzsNCiAJZXJycyA9IHFpYl9yZWFkX2tyZWc2NChkZCwga3JfZXJyc3RhdHVz KTsNCkBAIC0xNjYyLDEwICsxNjYxLDcgQEAgc3RhdGljIG5vaW5saW5lIHZvaWQgaGFuZGxlXzcz MjJfZXJyb3JzKHN0cnVjdCBxaWJfZGV2ZGF0YSAqZGQpDQogCWlmIChlcnJzICYgUUlCX0VfSEFS RFdBUkUpIHsNCiAJCSptc2cgPSAnXDAnOw0KIAkJcWliXzczMjJfaGFuZGxlX2h3ZXJyb3JzKGRk LCBtc2csIHNpemVvZihkZC0+Y3NwZWMtPmVtc2didWYpKTsNCi0JfSBlbHNlDQotCQlmb3IgKGxv Z19pZHggPSAwOyBsb2dfaWR4IDwgUUlCX0VFUF9MT0dfQ05UOyArK2xvZ19pZHgpDQotCQkJaWYg KGVycnMgJiBkZC0+ZWVwX3N0X21hc2tzW2xvZ19pZHhdLmVycnNfdG9fbG9nKQ0KLQkJCQlxaWJf aW5jX2VlcHJvbV9lcnIoZGQsIGxvZ19pZHgsIDEpOw0KKwl9DQogDQogCWlmIChlcnJzICYgUUlC X0VfU1BLVEVSUlMpIHsNCiAJCXFpYl9kaXNhcm1fNzMyMl9zZW5kZXJyYnVmcyhkZC0+cHBvcnQp Ow0K -- 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 Tue, Oct 10, 2017 at 05:59:51PM +0000, Bart Van Assche wrote: > On Tue, 2017-10-10 at 15:36 +0000, Marciniszyn, Mike wrote: > > Bart wrote: > > > How about dropping this patch and replacing it with a patch that removes all > > > uses of qib_inc_eeprom_err()? > > > > I'm fine with that too. > > How about the patch below? > > Thanks, > > Bart. > > > Subject: [PATCH] IB/qib: Remove the qib_inc_eeprom_err() macro > > Since the body of the qib_inc_eeprom_err() macro is empty, remove > the invocations of this macro. > > References: commit 18c0b82a3e45 (" IB/qib: Do not write EEPROM") > Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> > Cc: Mike Marciniszyn <infinipath@intel.com> > --- > drivers/infiniband/hw/qib/qib.h | 1 - > drivers/infiniband/hw/qib/qib_iba6120.c | 11 ----------- > drivers/infiniband/hw/qib/qib_iba7220.c | 10 ---------- > drivers/infiniband/hw/qib/qib_iba7322.c | 6 +----- > 4 files changed, 1 insertion(+), 27 deletions(-) > > diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h > index 1167a9c1776b..1869fce0ba00 100644 > --- a/drivers/infiniband/hw/qib/qib.h > +++ b/drivers/infiniband/hw/qib/qib.h > @@ -1297,7 +1297,6 @@ int qib_twsi_blk_rd(struct qib_devdata *dd, int dev, int addr, void *buffer, > int qib_twsi_blk_wr(struct qib_devdata *dd, int dev, int addr, > const void *buffer, int len); > void qib_get_eeprom_info(struct qib_devdata *); > -#define qib_inc_eeprom_err(dd, eidx, incr) > void qib_dump_lookup_output_queue(struct qib_devdata *); > void qib_force_pio_avail_update(struct qib_devdata *); > void qib_clear_symerror_on_linkup(unsigned long opaque); > diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c > index c4a4c57e0f0a..e0b52bab6f34 100644 > --- a/drivers/infiniband/hw/qib/qib_iba6120.c > +++ b/drivers/infiniband/hw/qib/qib_iba6120.c > @@ -748,7 +748,6 @@ static void qib_handle_6120_hwerrors(struct qib_devdata *dd, char *msg, > u32 bits, ctrl; > int isfatal = 0; > char *bitsmsg; > - int log_idx; > > hwerrs = qib_read_kreg64(dd, kr_hwerrstatus); > if (!hwerrs) > @@ -770,11 +769,6 @@ static void qib_handle_6120_hwerrors(struct qib_devdata *dd, char *msg, > > hwerrs &= dd->cspec->hwerrmask; > > - /* We log some errors to EEPROM, check if we have any of those. */ > - for (log_idx = 0; log_idx < QIB_EEP_LOG_CNT; ++log_idx) > - if (hwerrs & dd->eep_st_masks[log_idx].hwerrs_to_log) Does it mean that you can get rid of eep_st_masks and QIB_EEP_LOG_CNT too? > - qib_inc_eeprom_err(dd, log_idx, 1); > - > /* > * Make sure we get this much out, unless told to be quiet, > * or it's occurred within the last 5 seconds. > @@ -1004,7 +998,6 @@ static void handle_6120_errors(struct qib_devdata *dd, u64 errs) > char *msg; > u64 ignore_this_time = 0; > u64 iserr = 0; > - int log_idx; > struct qib_pportdata *ppd = dd->pport; > u64 mask; > > @@ -1015,10 +1008,6 @@ static void handle_6120_errors(struct qib_devdata *dd, u64 errs) > /* do these first, they are most important */ > if (errs & ERR_MASK(HardwareErr)) > qib_handle_6120_hwerrors(dd, msg, sizeof(dd->cspec->emsgbuf)); > - else > - for (log_idx = 0; log_idx < QIB_EEP_LOG_CNT; ++log_idx) > - if (errs & dd->eep_st_masks[log_idx].errs_to_log) > - qib_inc_eeprom_err(dd, log_idx, 1); > > if (errs & ~IB_E_BITSEXTANT) > qib_dev_err(dd, > diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c > index 78ce79be4120..75f2cfd0d272 100644 > --- a/drivers/infiniband/hw/qib/qib_iba7220.c > +++ b/drivers/infiniband/hw/qib/qib_iba7220.c > @@ -1094,7 +1094,6 @@ static void handle_7220_errors(struct qib_devdata *dd, u64 errs) > char *msg; > u64 ignore_this_time = 0; > u64 iserr = 0; > - int log_idx; > struct qib_pportdata *ppd = dd->pport; > u64 mask; > > @@ -1105,10 +1104,6 @@ static void handle_7220_errors(struct qib_devdata *dd, u64 errs) > /* do these first, they are most important */ > if (errs & ERR_MASK(HardwareErr)) > qib_7220_handle_hwerrors(dd, msg, sizeof(dd->cspec->emsgbuf)); > - else > - for (log_idx = 0; log_idx < QIB_EEP_LOG_CNT; ++log_idx) > - if (errs & dd->eep_st_masks[log_idx].errs_to_log) > - qib_inc_eeprom_err(dd, log_idx, 1); > > if (errs & QLOGIC_IB_E_SDMAERRS) > sdma_7220_errors(ppd, errs); > @@ -1302,7 +1297,6 @@ static void qib_7220_handle_hwerrors(struct qib_devdata *dd, char *msg, > u32 bits, ctrl; > int isfatal = 0; > char *bitsmsg; > - int log_idx; > > hwerrs = qib_read_kreg64(dd, kr_hwerrstatus); > if (!hwerrs) > @@ -1326,10 +1320,6 @@ static void qib_7220_handle_hwerrors(struct qib_devdata *dd, char *msg, > > hwerrs &= dd->cspec->hwerrmask; > > - /* We log some errors to EEPROM, check if we have any of those. */ > - for (log_idx = 0; log_idx < QIB_EEP_LOG_CNT; ++log_idx) > - if (hwerrs & dd->eep_st_masks[log_idx].hwerrs_to_log) > - qib_inc_eeprom_err(dd, log_idx, 1); > if (hwerrs & ~(TXEMEMPARITYERR_PIOBUF | TXEMEMPARITYERR_PIOPBC | > RXE_PARITY)) > qib_devinfo(dd->pcidev, > diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c > index 4d02cffe4e03..77217fae9c06 100644 > --- a/drivers/infiniband/hw/qib/qib_iba7322.c > +++ b/drivers/infiniband/hw/qib/qib_iba7322.c > @@ -1644,7 +1644,6 @@ static noinline void handle_7322_errors(struct qib_devdata *dd) > u64 iserr = 0; > u64 errs; > u64 mask; > - int log_idx; > > qib_stats.sps_errints++; > errs = qib_read_kreg64(dd, kr_errstatus); > @@ -1662,10 +1661,7 @@ static noinline void handle_7322_errors(struct qib_devdata *dd) > if (errs & QIB_E_HARDWARE) { > *msg = '\0'; > qib_7322_handle_hwerrors(dd, msg, sizeof(dd->cspec->emsgbuf)); > - } else > - for (log_idx = 0; log_idx < QIB_EEP_LOG_CNT; ++log_idx) > - if (errs & dd->eep_st_masks[log_idx].errs_to_log) > - qib_inc_eeprom_err(dd, log_idx, 1); > + } > > if (errs & QIB_E_SPKTERRS) { > qib_disarm_7322_senderrbufs(dd->pport); > N?????r??y????b?X??ǧv?^?){.n?+????{??ٚ?{ay? ʇڙ?,j??f???h???z? ?w??? ???j:+v???w?j?m????????zZ+?????ݢj"??!
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h index 1167a9c1776b..f2fffbd3e95c 100644 --- a/drivers/infiniband/hw/qib/qib.h +++ b/drivers/infiniband/hw/qib/qib.h @@ -1297,7 +1297,7 @@ int qib_twsi_blk_rd(struct qib_devdata *dd, int dev, int addr, void *buffer, int qib_twsi_blk_wr(struct qib_devdata *dd, int dev, int addr, const void *buffer, int len); void qib_get_eeprom_info(struct qib_devdata *); -#define qib_inc_eeprom_err(dd, eidx, incr) +#define qib_inc_eeprom_err(dd, eidx, incr) do { } while (0) void qib_dump_lookup_output_queue(struct qib_devdata *); void qib_force_pio_avail_update(struct qib_devdata *); void qib_clear_symerror_on_linkup(unsigned long opaque);
Avoid that using the qib_inc_eeprom_err() macro in an if-statement triggers the following compiler warning: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: Mike Marciniszyn <infinipath@intel.com> --- drivers/infiniband/hw/qib/qib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)