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>

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 90b672f..9dbb89e 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -12135,7 +12135,7 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op,
                set_intr_bits(dd, IS_RCVURGENT_START + rcd->ctxt,
                              IS_RCVURGENT_START + rcd->ctxt, false);
 
-       hfi1_cdbg(RCVCTRL, "ctxt %d rcvctrl 0x%llx\n", ctxt, rcvctrl);
+       hfi1_cdbg(RCVCTRL, "ctxt %d rcvctrl 0x%llx", ctxt, rcvctrl);
        write_kctxt_csr(dd, ctxt, RCV_CTXT_CTRL, rcvctrl);
 
        /* work around sticky RcvCtxtStatus.BlockedRHQFull */
@@ -12205,10 +12205,10 @@ u32 hfi1_read_cntrs(struct hfi1_devdata *dd, char **namep, u64 **cntrp)
                        hfi1_cdbg(CNTR, "reading %s", entry->name);
                        if (entry->flags & CNTR_DISABLED) {
                                /* Nothing */
-                               hfi1_cdbg(CNTR, "\tDisabled\n");
+                               hfi1_cdbg(CNTR, "\tDisabled");
                        } else {
                                if (entry->flags & CNTR_VL) {
-                                       hfi1_cdbg(CNTR, "\tPer VL\n");
+                                       hfi1_cdbg(CNTR, "\tPer VL");
                                        for (j = 0; j < C_VL_COUNT; j++) {
                                                val = entry->rw_cntr(entry,
                                                                  dd, j,
@@ -12216,21 +12216,21 @@ u32 hfi1_read_cntrs(struct hfi1_devdata *dd, char **namep, u64 **cntrp)
                                                                  0);
                                                hfi1_cdbg(
                                                   CNTR,
-                                                  "\t\tRead 0x%llx for %d\n",
+                                                  "\t\tRead 0x%llx for %d",
                                                   val, j);
                                                dd->cntrs[entry->offset + j] =
                                                                            val;
                                        }
                                } else if (entry->flags & CNTR_SDMA) {
                                        hfi1_cdbg(CNTR,
-                                                 "\t Per SDMA Engine\n");
+                                                 "\t Per SDMA Engine");
                                        for (j = 0; j < chip_sdma_engines(dd);
                                             j++) {
                                                val =
                                                entry->rw_cntr(entry, dd, j,
                                                               CNTR_MODE_R, 0);
                                                hfi1_cdbg(CNTR,
-                                                         "\t\tRead 0x%llx for %d\n",
+                                                         "\t\tRead 0x%llx for %d",
                                                          val, j);
                                                dd->cntrs[entry->offset + j] =
                                                                        val;
@@ -12271,7 +12271,7 @@ u32 hfi1_read_portcntrs(struct hfi1_pportdata *ppd, char **namep, u64 **cntrp)
                        hfi1_cdbg(CNTR, "reading %s", entry->name);
                        if (entry->flags & CNTR_DISABLED) {
                                /* Nothing */
-                               hfi1_cdbg(CNTR, "\tDisabled\n");
+                               hfi1_cdbg(CNTR, "\tDisabled");
                                continue;
                        }
 
@@ -12513,7 +12513,7 @@ static void do_update_synth_timer(struct work_struct *work)
 
        hfi1_cdbg(
            CNTR,
-           "[%d] curr tx=0x%llx rx=0x%llx :: last tx=0x%llx rx=0x%llx\n",
+           "[%d] curr tx=0x%llx rx=0x%llx :: last tx=0x%llx rx=0x%llx",
            dd->unit, cur_tx, cur_rx, dd->last_tx, dd->last_rx);
 
        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)
        } else {
                total_flits = (cur_tx - dd->last_tx) + (cur_rx - dd->last_rx);
                hfi1_cdbg(CNTR,
-                         "[%d] total flits 0x%llx limit 0x%llx\n", dd->unit,
+                         "[%d] total flits 0x%llx limit 0x%llx", dd->unit,
                          total_flits, (u64)CNTR_32BIT_MAX);
                if (total_flits >= CNTR_32BIT_MAX) {
                        hfi1_cdbg(CNTR, "[%d] 32bit limit hit, updating",

diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c
index bcc6bc0..f4492fa 100644 (file)
--- a/drivers/infiniband/hw/hfi1/driver.c
+++ b/drivers/infiniband/hw/hfi1/driver.c
@@ -1597,7 +1597,7 @@ static int hfi1_setup_bypass_packet(struct hfi1_packet *packet)
 
        return 0;
 drop:
-       hfi1_cdbg(PKT, "%s: packet dropped\n", __func__);
+       hfi1_cdbg(PKT, "%s: packet dropped", __func__);
        ibp->rvp.n_pkt_drops++;
        return -EINVAL;
 }

diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index b1d6ca7..acbc52b 100644 (file)
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -977,7 +977,7 @@ static int allocate_ctxt(struct hfi1_filedata *fd, struct hfi1_devdata *dd,
                ret = -ENOMEM;
                goto ctxdata_free;
        }
-       hfi1_cdbg(PROC, "allocated send context %u(%u)\n", uctxt->sc->sw_index,
+       hfi1_cdbg(PROC, "allocated send context %u(%u)", uctxt->sc->sw_index,
                  uctxt->sc->hw_context);
        ret = sc_enable(uctxt->sc);
        if (ret)

diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 62b6c50..6de37c5 100644 (file)
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -342,7 +342,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa,
                INIT_LIST_HEAD(&rcd->flow_queue.queue_head);
                INIT_LIST_HEAD(&rcd->rarr_queue.queue_head);
 
-               hfi1_cdbg(PROC, "setting up context %u\n", rcd->ctxt);
+               hfi1_cdbg(PROC, "setting up context %u", rcd->ctxt);
 
                /*
                 * Calculate the context's RcvArray entry starting point.
@@ -400,7 +400,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa,
                        rcd->egrbufs.count = MAX_EAGER_ENTRIES;
                }
                hfi1_cdbg(PROC,
-                         "ctxt%u: max Eager buffer RcvArray entries: %u\n",
+                         "ctxt%u: max Eager buffer RcvArray entries: %u",
                          rcd->ctxt, rcd->egrbufs.count);
 
                /*
@@ -432,7 +432,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa,
                if (rcd->egrbufs.size < hfi1_max_mtu) {
                        rcd->egrbufs.size = __roundup_pow_of_two(hfi1_max_mtu);
                        hfi1_cdbg(PROC,
-                                 "ctxt%u: eager bufs size too small. Adjusting to %u\n",
+                                 "ctxt%u: eager bufs size too small. Adjusting to %u",
                                    rcd->ctxt, rcd->egrbufs.size);
                }
                rcd->egrbufs.rcvtid_size = HFI1_MAX_EAGER_BUFFER_SIZE;
@@ -1920,7 +1920,7 @@ int hfi1_setup_eagerbufs(struct hfi1_ctxtdata *rcd)
        rcd->egrbufs.size = alloced_bytes;
 
        hfi1_cdbg(PROC,
-                 "ctxt%u: Alloced %u rcv tid entries @ %uKB, total %uKB\n",
+                 "ctxt%u: Alloced %u rcv tid entries @ %uKB, total %uKB",
                  rcd->ctxt, rcd->egrbufs.alloced,
                  rcd->egrbufs.rcvtid_size / 1024, rcd->egrbufs.size / 1024);
 
@@ -1943,13 +1943,13 @@ int hfi1_setup_eagerbufs(struct hfi1_ctxtdata *rcd)
                rcd->expected_count = MAX_TID_PAIR_ENTRIES * 2;
 
        rcd->expected_base = rcd->eager_base + egrtop;
-       hfi1_cdbg(PROC, "ctxt%u: eager:%u, exp:%u, egrbase:%u, expbase:%u\n",
+       hfi1_cdbg(PROC, "ctxt%u: eager:%u, exp:%u, egrbase:%u, expbase:%u",
                  rcd->ctxt, rcd->egrbufs.alloced, rcd->expected_count,
                  rcd->eager_base, rcd->expected_base);
 
        if (!hfi1_rcvbuf_validate(rcd->egrbufs.rcvtid_size, PT_EAGER, &order)) {
                hfi1_cdbg(PROC,
-                         "ctxt%u: current Eager buffer size is invalid %u\n",
+                         "ctxt%u: current Eager buffer size is invalid %u",
                          rcd->ctxt, rcd->egrbufs.rcvtid_size);
                ret = -EINVAL;
                goto bail_rcvegrbuf_phys;

diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c
index 51ae58c..62e7dc9 100644 (file)
--- a/drivers/infiniband/hw/hfi1/pio.c
+++ b/drivers/infiniband/hw/hfi1/pio.c
@@ -820,7 +820,7 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
        }
 
        hfi1_cdbg(PIO,
-                 "Send context %u(%u) %s group %u credits %u credit_ctrl 0x%llx threshold %u\n",
+                 "Send context %u(%u) %s group %u credits %u credit_ctrl 0x%llx threshold %u",
                  sw_index,
                  hw_context,
                  sc_type_name(type),