Skip to content

Commit d2590ed

Browse files
DeanLuickrleon
DeanLuick
authored and
rleon
committed
IB/hfi1: Remove trace newlines
The hfi1_cdbg trace mechanism appends a newline. Remove trailing newlines from all format strings. Signed-off-by: Dean Luick <dean.luick@cornelisnetworks.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com> Link: https://lore.kernel.org/r/168088634897.3027109.10401662436950683555.stgit@252.162.96.66.static.eigbox.net Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent eca5cd9 commit d2590ed

5 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎drivers/infiniband/hw/hfi1/chip.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12135,7 +12135,7 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op,
1213512135
set_intr_bits(dd, IS_RCVURGENT_START + rcd->ctxt,
1213612136
IS_RCVURGENT_START + rcd->ctxt, false);
1213712137

12138-
hfi1_cdbg(RCVCTRL, "ctxt %d rcvctrl 0x%llx\n", ctxt, rcvctrl);
12138+
hfi1_cdbg(RCVCTRL, "ctxt %d rcvctrl 0x%llx", ctxt, rcvctrl);
1213912139
write_kctxt_csr(dd, ctxt, RCV_CTXT_CTRL, rcvctrl);
1214012140

1214112141
/* work around sticky RcvCtxtStatus.BlockedRHQFull */
@@ -12205,32 +12205,32 @@ u32 hfi1_read_cntrs(struct hfi1_devdata *dd, char **namep, u64 **cntrp)
1220512205
hfi1_cdbg(CNTR, "reading %s", entry->name);
1220612206
if (entry->flags & CNTR_DISABLED) {
1220712207
/* Nothing */
12208-
hfi1_cdbg(CNTR, "\tDisabled\n");
12208+
hfi1_cdbg(CNTR, "\tDisabled");
1220912209
} else {
1221012210
if (entry->flags & CNTR_VL) {
12211-
hfi1_cdbg(CNTR, "\tPer VL\n");
12211+
hfi1_cdbg(CNTR, "\tPer VL");
1221212212
for (j = 0; j < C_VL_COUNT; j++) {
1221312213
val = entry->rw_cntr(entry,
1221412214
dd, j,
1221512215
CNTR_MODE_R,
1221612216
0);
1221712217
hfi1_cdbg(
1221812218
CNTR,
12219-
"\t\tRead 0x%llx for %d\n",
12219+
"\t\tRead 0x%llx for %d",
1222012220
val, j);
1222112221
dd->cntrs[entry->offset + j] =
1222212222
val;
1222312223
}
1222412224
} else if (entry->flags & CNTR_SDMA) {
1222512225
hfi1_cdbg(CNTR,
12226-
"\t Per SDMA Engine\n");
12226+
"\t Per SDMA Engine");
1222712227
for (j = 0; j < chip_sdma_engines(dd);
1222812228
j++) {
1222912229
val =
1223012230
entry->rw_cntr(entry, dd, j,
1223112231
CNTR_MODE_R, 0);
1223212232
hfi1_cdbg(CNTR,
12233-
"\t\tRead 0x%llx for %d\n",
12233+
"\t\tRead 0x%llx for %d",
1223412234
val, j);
1223512235
dd->cntrs[entry->offset + j] =
1223612236
val;
@@ -12271,7 +12271,7 @@ u32 hfi1_read_portcntrs(struct hfi1_pportdata *ppd, char **namep, u64 **cntrp)
1227112271
hfi1_cdbg(CNTR, "reading %s", entry->name);
1227212272
if (entry->flags & CNTR_DISABLED) {
1227312273
/* Nothing */
12274-
hfi1_cdbg(CNTR, "\tDisabled\n");
12274+
hfi1_cdbg(CNTR, "\tDisabled");
1227512275
continue;
1227612276
}
1227712277

@@ -12513,7 +12513,7 @@ static void do_update_synth_timer(struct work_struct *work)
1251312513

1251412514
hfi1_cdbg(
1251512515
CNTR,
12516-
"[%d] curr tx=0x%llx rx=0x%llx :: last tx=0x%llx rx=0x%llx\n",
12516+
"[%d] curr tx=0x%llx rx=0x%llx :: last tx=0x%llx rx=0x%llx",
1251712517
dd->unit, cur_tx, cur_rx, dd->last_tx, dd->last_rx);
1251812518

1251912519
if ((cur_tx < dd->last_tx) || (cur_rx < dd->last_rx)) {
@@ -12527,7 +12527,7 @@ static void do_update_synth_timer(struct work_struct *work)
1252712527
} else {
1252812528
total_flits = (cur_tx - dd->last_tx) + (cur_rx - dd->last_rx);
1252912529
hfi1_cdbg(CNTR,
12530-
"[%d] total flits 0x%llx limit 0x%llx\n", dd->unit,
12530+
"[%d] total flits 0x%llx limit 0x%llx", dd->unit,
1253112531
total_flits, (u64)CNTR_32BIT_MAX);
1253212532
if (total_flits >= CNTR_32BIT_MAX) {
1253312533
hfi1_cdbg(CNTR, "[%d] 32bit limit hit, updating",

‎drivers/infiniband/hw/hfi1/driver.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,7 @@ static int hfi1_setup_bypass_packet(struct hfi1_packet *packet)
15971597

15981598
return 0;
15991599
drop:
1600-
hfi1_cdbg(PKT, "%s: packet dropped\n", __func__);
1600+
hfi1_cdbg(PKT, "%s: packet dropped", __func__);
16011601
ibp->rvp.n_pkt_drops++;
16021602
return -EINVAL;
16031603
}

‎drivers/infiniband/hw/hfi1/file_ops.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ static int allocate_ctxt(struct hfi1_filedata *fd, struct hfi1_devdata *dd,
977977
ret = -ENOMEM;
978978
goto ctxdata_free;
979979
}
980-
hfi1_cdbg(PROC, "allocated send context %u(%u)\n", uctxt->sc->sw_index,
980+
hfi1_cdbg(PROC, "allocated send context %u(%u)", uctxt->sc->sw_index,
981981
uctxt->sc->hw_context);
982982
ret = sc_enable(uctxt->sc);
983983
if (ret)

‎drivers/infiniband/hw/hfi1/init.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa,
342342
INIT_LIST_HEAD(&rcd->flow_queue.queue_head);
343343
INIT_LIST_HEAD(&rcd->rarr_queue.queue_head);
344344

345-
hfi1_cdbg(PROC, "setting up context %u\n", rcd->ctxt);
345+
hfi1_cdbg(PROC, "setting up context %u", rcd->ctxt);
346346

347347
/*
348348
* Calculate the context's RcvArray entry starting point.
@@ -400,7 +400,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa,
400400
rcd->egrbufs.count = MAX_EAGER_ENTRIES;
401401
}
402402
hfi1_cdbg(PROC,
403-
"ctxt%u: max Eager buffer RcvArray entries: %u\n",
403+
"ctxt%u: max Eager buffer RcvArray entries: %u",
404404
rcd->ctxt, rcd->egrbufs.count);
405405

406406
/*
@@ -432,7 +432,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa,
432432
if (rcd->egrbufs.size < hfi1_max_mtu) {
433433
rcd->egrbufs.size = __roundup_pow_of_two(hfi1_max_mtu);
434434
hfi1_cdbg(PROC,
435-
"ctxt%u: eager bufs size too small. Adjusting to %u\n",
435+
"ctxt%u: eager bufs size too small. Adjusting to %u",
436436
rcd->ctxt, rcd->egrbufs.size);
437437
}
438438
rcd->egrbufs.rcvtid_size = HFI1_MAX_EAGER_BUFFER_SIZE;
@@ -1920,7 +1920,7 @@ int hfi1_setup_eagerbufs(struct hfi1_ctxtdata *rcd)
19201920
rcd->egrbufs.size = alloced_bytes;
19211921

19221922
hfi1_cdbg(PROC,
1923-
"ctxt%u: Alloced %u rcv tid entries @ %uKB, total %uKB\n",
1923+
"ctxt%u: Alloced %u rcv tid entries @ %uKB, total %uKB",
19241924
rcd->ctxt, rcd->egrbufs.alloced,
19251925
rcd->egrbufs.rcvtid_size / 1024, rcd->egrbufs.size / 1024);
19261926

@@ -1943,13 +1943,13 @@ int hfi1_setup_eagerbufs(struct hfi1_ctxtdata *rcd)
19431943
rcd->expected_count = MAX_TID_PAIR_ENTRIES * 2;
19441944

19451945
rcd->expected_base = rcd->eager_base + egrtop;
1946-
hfi1_cdbg(PROC, "ctxt%u: eager:%u, exp:%u, egrbase:%u, expbase:%u\n",
1946+
hfi1_cdbg(PROC, "ctxt%u: eager:%u, exp:%u, egrbase:%u, expbase:%u",
19471947
rcd->ctxt, rcd->egrbufs.alloced, rcd->expected_count,
19481948
rcd->eager_base, rcd->expected_base);
19491949

19501950
if (!hfi1_rcvbuf_validate(rcd->egrbufs.rcvtid_size, PT_EAGER, &order)) {
19511951
hfi1_cdbg(PROC,
1952-
"ctxt%u: current Eager buffer size is invalid %u\n",
1952+
"ctxt%u: current Eager buffer size is invalid %u",
19531953
rcd->ctxt, rcd->egrbufs.rcvtid_size);
19541954
ret = -EINVAL;
19551955
goto bail_rcvegrbuf_phys;

‎drivers/infiniband/hw/hfi1/pio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
820820
}
821821

822822
hfi1_cdbg(PIO,
823-
"Send context %u(%u) %s group %u credits %u credit_ctrl 0x%llx threshold %u\n",
823+
"Send context %u(%u) %s group %u credits %u credit_ctrl 0x%llx threshold %u",
824824
sw_index,
825825
hw_context,
826826
sc_type_name(type),

0 commit comments

Comments
 (0)